jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-26 20:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix check-dependency.sh to work with arguments containing spaces (#969)

Browse Source
This commit is contained in:
Andrew Scheller 2016-12-11 23:09:57 +00:00 committed by Juan Cruz Viotti
parent c4a92d772d
commit 61860a79e3
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build/check-dependency.sh
View File

@ -17,18 +17,18 @@
### ###
set -e set -e
set +u
ARGV_DEPENDENCIES=$*
set -u set -u
if [ -z "$ARGV_DEPENDENCIES" ]; then if [ "$#" -lt 1 ]; then
echo "Usage: $0 <dependency...>" echo "Usage: $0 <dependency...>"
exit 1 exit 1
fi fi
RESULT="" RESULT=""
DEPENDENCIES=""
for dependency in $ARGV_DEPENDENCIES; do for dependency in "$@"; do
DEPENDENCIES="$DEPENDENCIES $(echo $dependency | cut -d ' ' -f 1)"
if command -v $dependency 2>/dev/null 1>&2; then if command -v $dependency 2>/dev/null 1>&2; then
RESULT=$dependency RESULT=$dependency
break break
@ -36,7 +36,11 @@ for dependency in $ARGV_DEPENDENCIES; do
done done
if [ -z "$RESULT" ]; then if [ -z "$RESULT" ]; then
echo "Dependency missing: $ARGV_DEPENDENCIES" 1>&2 if [ "$#" -eq 1 ]; then
echo "Dependency missing:$DEPENDENCIES" 1>&2
else
echo "No dependency found from:$DEPENDENCIES" 1>&2
fi
exit 1 exit 1
fi fi

5
scripts/build/download-tool.sh
View File

@ -21,10 +21,7 @@ set -e
./scripts/build/check-dependency.sh wget ./scripts/build/check-dependency.sh wget
SHA256SUM=$(./scripts/build/check-dependency.sh sha256sum shasum) SHA256SUM=$(./scripts/build/check-dependency.sh sha256sum "shasum -a 256")
if [ "$SHA256SUM" == "shasum" ]; then
SHA256SUM="$SHA256SUM -a 256"
fi
function usage() { function usage() {
echo "Usage: $0" echo "Usage: $0"