]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Fix all "export" commands. Fixes some issues with weird shells.
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 10 Apr 2017 15:08:35 +0000 (11:08 -0400)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 10 Apr 2017 15:08:35 +0000 (11:08 -0400)
all
misc/tools/all/git.subr
misc/tools/demopacker.sh
misc/tools/encode-demos.sh

diff --git a/all b/all
index a6e8ebb0372a24e3d3814c071eee6557507bf7d5..dcc4c4007e6cf89c88e4d410dbf2ea10f2a6144d 100755 (executable)
--- a/all
+++ b/all
@@ -21,10 +21,10 @@ ESC="\e"
 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."
index b14a8b6f1acd8e0f67443f7a211fcdf3c80fa3af..ac6594fbf8214f39f84974beec21906046bd1d21 100644 (file)
@@ -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
        )
index 44f91b1e2cb759401106635b69491775d75b29a1..068478ac3f3cf7e1f860669d8db3c49a6a9ffa80 100755 (executable)
@@ -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
index 139b4a5389b6ab033d604f7dc727434644bc17ab..ab84bd3c33e5076f21b7b595a39f05b055e44b60 100755 (executable)
@@ -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() {