From 155bb8c3341289661a561353eaed7604f2d241ad Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 10 Apr 2017 11:08:35 -0400 Subject: [PATCH] Fix all "export" commands. Fixes some issues with weird shells. --- all | 4 ++-- misc/tools/all/git.subr | 2 +- misc/tools/demopacker.sh | 2 +- misc/tools/encode-demos.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/all b/all index a6e8ebb..dcc4c40 100755 --- a/all +++ b/all @@ -21,10 +21,10 @@ ESC="" d00=`pwd` case "$0" in /*/all) - export d0=${0%/all} + export d0="${0%/all}" ;; */all) - export d0=$d00/${0%/all} + export d0="$d00/${0%/all}" ;; *) $ECHO "Cannot find myself." diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr index b14a8b6..ac6594f 100644 --- a/misc/tools/all/git.subr +++ b/misc/tools/all/git.subr @@ -63,7 +63,7 @@ mirrorspeed() # now actually time it ( set +x - export REPO=$1 # so that the sh -c subshell can use it + export REPO="$1" # so that the sh -c subshell can use it { measure_time sh -c 'git ls-remote "$REPO" refs/heads/master >/dev/null 2>&1'; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' | grep . || echo 0 # unit: clock ticks (depends on what "time" returns ) diff --git a/misc/tools/demopacker.sh b/misc/tools/demopacker.sh index 44f91b1..068478a 100755 --- a/misc/tools/demopacker.sh +++ b/misc/tools/demopacker.sh @@ -64,7 +64,7 @@ while [ -n "$allfiles" ]; do done export do_jpeg=true -export dp_jpeg_if_not_dds=false +export do_jpeg_if_not_dds=false export jpeg_qual_rgb=70 export jpeg_qual_a=90 export do_dds=false diff --git a/misc/tools/encode-demos.sh b/misc/tools/encode-demos.sh index 139b4a5..ab84bd3 100755 --- a/misc/tools/encode-demos.sh +++ b/misc/tools/encode-demos.sh @@ -83,7 +83,7 @@ _check_xonotic_dir() { _get_xonotic_dir() { relative_dir=$(dirname $0)/../.. _check_xonotic_dir ${relative_dir} - export XONOTIC_DIR=$(cd ${relative_dir}; pwd) + export XONOTIC_DIR="$(cd ${relative_dir}; pwd)" } _kill_xonotic() {