Properly handle spaces in filenames along the path to the installer.

git-svn-id: svn://localhost/ardour2/branches/3.0@9613 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh
index 33863ee64603cde0ae3a306461877a6bfc83dc62..a69a478a7fa9af86502909a22725149907231652 100755 (executable)
--- a/tools/linux_packaging/install.sh
+++ b/tools/linux_packaging/install.sh
@@ -7,19 +7,19 @@
 # so go ahead and figure out our path and make sure we are in that directory.
 
 SAVED_PWD=$PWD
-PKG_PATH=$(dirname $(readlink -f $0))
-cd ${PKG_PATH}
+PKG_PATH=$(dirname "$(readlink -f "$0")")
+cd "${PKG_PATH}"
 
 if [ -z "$TERM" ] || [ "$TERM" = "dumb" ]; then
        if which xterm > /dev/null; then
-               exec xterm -e ${PKG_PATH}/.stage2.run
+               exec xterm -e "${PKG_PATH}/.stage2.run"
        elif which gnome-terminal > /dev/null; then
-               exec gnome-terminal -e ${PKG_PATH}/.stage2.run
+               exec gnome-terminal -e "${PKG_PATH}/.stage2.run"
        elif which konsole > /dev/null; then
-               exec konsole -e ${PKG_PATH}/.stage2.run
+               exec konsole -e "${PKG_PATH}/.stage2.run"
        fi
 else
-       ${PKG_PATH}/.stage2.run
+       "${PKG_PATH}/.stage2.run"
 fi
 
-cd ${SAVED_PWD}
+cd "${SAVED_PWD}"

diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run
index 51c7d3a2f15c8aa2fb7aa221516acb45144d2991..a438ea697a40dfbf3c3be260ca016f5ad444f8e0 100755 (executable)
--- a/tools/linux_packaging/stage2.run
+++ b/tools/linux_packaging/stage2.run
@@ -101,8 +101,8 @@ SystemInstall ()
 
 # If you double click a script, some systems don't get the PWD correct.
 # Force it to be correct
-PKG_PATH=$(dirname $(readlink -f $0))
-cd ${PKG_PATH}
+PKG_PATH=$(dirname "$(readlink -f "$0")")
+cd "${PKG_PATH}"
 
 echo ""
 echo "Welcome to the ${PGM_NAME} installer"
@@ -196,7 +196,7 @@ else
        REQUIRED_BYTES=$(cat .${PGM_NAME}_${ARCH}-*.size)
 
        #Check space in current folder
-       FREE_BYTES=$(df -P -B 1 ${PKG_PATH} | grep / | awk '{print $4}')
+       FREE_BYTES=$(df -P -B 1 "${PKG_PATH}" | grep / | awk '{print $4}')
 
        if [ ${FREE_BYTES} -le ${REQUIRED_BYTES} ] ; then
                echo ""