diff options
| -rw-r--r-- | combine-installers.sh | 4 | ||||
| -rwxr-xr-x | gen-install-script.sh | 2 | ||||
| -rwxr-xr-x | gen-installer.sh | 2 | ||||
| -rw-r--r-- | install-template.sh | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/combine-installers.sh b/combine-installers.sh index d944cfe..71fc46c 100644 --- a/combine-installers.sh +++ b/combine-installers.sh @@ -208,7 +208,7 @@ need_cmd mkdir need_cmd echo need_cmd tr -CFG_SRC_DIR="$(cd $(dirname $0) && pwd)" +CFG_SRC_DIR="$(cd $(dirname "$0") && pwd)" CFG_SELF="$0" CFG_ARGS="$@" @@ -287,7 +287,7 @@ for input_tarball in $INPUT_TARBALLS; do FILE=`echo $directive | cut -f2 -d:` NEW_FILE_PATH="$CFG_WORK_DIR/$CFG_PACKAGE_NAME/$FILE" - mkdir -p "$(dirname $NEW_FILE_PATH)" + mkdir -p "$(dirname "$NEW_FILE_PATH")" case "$COMMAND" in file | dir) diff --git a/gen-install-script.sh b/gen-install-script.sh index 601d246..ede5e1c 100755 --- a/gen-install-script.sh +++ b/gen-install-script.sh @@ -205,7 +205,7 @@ need_cmd sed need_cmd chmod need_cmd cat -CFG_SRC_DIR="$(cd $(dirname $0) && pwd)" +CFG_SRC_DIR="$(cd $(dirname "$0") && pwd)" CFG_SELF="$0" CFG_ARGS="$@" diff --git a/gen-installer.sh b/gen-installer.sh index 930de39..f2118ae 100755 --- a/gen-installer.sh +++ b/gen-installer.sh @@ -209,7 +209,7 @@ need_cmd echo need_cmd tr need_cmd awk -CFG_SRC_DIR="$(cd $(dirname $0) && pwd)" +CFG_SRC_DIR="$(cd $(dirname "$0") && pwd)" CFG_SELF="$0" CFG_ARGS="$@" diff --git a/install-template.sh b/install-template.sh index 44e11a2..81710b2 100644 --- a/install-template.sh +++ b/install-template.sh @@ -441,8 +441,8 @@ need_ok "failed to remove install probe" # Sanity check: don't install to the directory containing the installer. # That would surely cause chaos. msg "verifying destination is not the same as source" -INSTALLER_DIR="$(cd $(dirname $0) && pwd)" -PREFIX_DIR="$(cd $dest_prefix && pwd)" +INSTALLER_DIR="$(cd $(dirname "$0") && pwd)" +PREFIX_DIR="$(cd "$dest_prefix" && pwd)" if [ "${INSTALLER_DIR}" = "${PREFIX_DIR}" ] then err "can't install to same directory as installer" @@ -688,7 +688,7 @@ for component in $COMPONENTS; do fi # Make sure there's a directory for it - umask 022 && mkdir -p "$(dirname ${FILE_INSTALL_PATH})" + umask 022 && mkdir -p "$(dirname "${FILE_INSTALL_PATH}")" need_ok "directory creation failed" # Make the path absolute so we can uninstall it later without |