diff options
author | Andrey Mozzhuhin <amozzhuhin@yandex.ru> | 2021-01-16 11:18:41 +0300 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2021-01-19 04:22:10 -1000 |
commit | 84bdeabd40183006d136f0ae416efa5f71e3557b (patch) | |
tree | 2b1c7a1717a486612d43a962dc2d5c8fcce68894 | |
parent | d5cb96e3b5501b7349d075c47636902c9ce1c49c (diff) | |
download | openembedded-core-contrib-84bdeabd40183006d136f0ae416efa5f71e3557b.tar.gz |
toolchain-shar-extract.sh: Handle special characters in script path
Extracting SDK archive may fail if the script is run using a path with
special characters such as space or asterisk. This is because the shell
interprets such characters after expanding the $0 variable.
Added quotes to all uses of the shell variable $0 to fix this.
Signed-off-by: Andrey Mozzhuhin <amozzhuhin@yandex.ru>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0453acbbd45604537090ec7a3295b34309e6eecb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/files/toolchain-shar-extract.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index bea6d4189a..dd9342758b 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -95,7 +95,7 @@ while getopts ":yd:npDRSl" OPT; do listcontents=1 ;; *) - echo "Usage: $(basename $0) [-y] [-d <dir>]" + echo "Usage: $(basename "$0") [-y] [-d <dir>]" echo " -y Automatic yes to all prompts" echo " -d <dir> Install the SDK to <dir>" echo "======== Extensible SDK only options ============" @@ -111,17 +111,17 @@ while getopts ":yd:npDRSl" OPT; do esac done -payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1)) +payload_offset=$(($(grep -na -m1 "^MARKER:$" "$0"|cut -d':' -f1) + 1)) if [ "$listcontents" = "1" ] ; then if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then - tail -n +$payload_offset $0 > sdk.zip + tail -n +$payload_offset "$0" > sdk.zip if unzip -l sdk.zip;then rm sdk.zip else rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| tar tvJ || exit 1 + tail -n +$payload_offset "$0"| tar tvJ || exit 1 fi exit fi @@ -242,14 +242,14 @@ fi printf "Extracting SDK..." if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then - tail -n +$payload_offset $0 > sdk.zip + tail -n +$payload_offset "$0" > sdk.zip if $SUDO_EXEC unzip $EXTRA_TAR_OPTIONS sdk.zip -d $target_sdk_dir;then rm sdk.zip else rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset "$0"| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" |