From 2e0d0347a110937c71d435243376eca4721c1433 Mon Sep 17 00:00:00 2001 From: George Kapetanakis Date: Thu, 19 Mar 2026 15:56:36 -0400 Subject: [PATCH] Quote all instances of DIR and ROOT They are derived from $0, so not quoting them can break scripts if $0 contains whitespace --- cidr2ip/build-all-platforms.sh | 6 +++--- cidr2ip/build.sh | 6 +++--- cidr2ip/docker.sh | 6 +++--- cidr2ip/release.sh | 6 +++--- cidr2range/build-all-platforms.sh | 6 +++--- cidr2range/build.sh | 6 +++--- cidr2range/docker.sh | 6 +++--- cidr2range/release.sh | 6 +++--- grepdomain/build-all-platforms.sh | 6 +++--- grepdomain/build.sh | 6 +++--- grepdomain/docker.sh | 6 +++--- grepdomain/release.sh | 6 +++--- grepip/build-all-platforms.sh | 6 +++--- grepip/build.sh | 6 +++--- grepip/docker.sh | 6 +++--- grepip/release.sh | 6 +++--- ipinfo/build-all-platforms.sh | 6 +++--- ipinfo/build.sh | 6 +++--- ipinfo/docker.sh | 6 +++--- ipinfo/release.sh | 6 +++--- matchip/build-all-platforms.sh | 6 +++--- matchip/build.sh | 6 +++--- matchip/docker.sh | 6 +++--- matchip/release.sh | 6 +++--- prips/build-all-platforms.sh | 6 +++--- prips/build.sh | 6 +++--- prips/docker.sh | 6 +++--- prips/release.sh | 6 +++--- randip/build-all-platforms.sh | 6 +++--- randip/build.sh | 6 +++--- randip/docker.sh | 6 +++--- randip/release.sh | 6 +++--- range2cidr/build-all-platforms.sh | 6 +++--- range2cidr/build.sh | 6 +++--- range2cidr/docker.sh | 6 +++--- range2cidr/release.sh | 6 +++--- range2ip/build-all-platforms.sh | 6 +++--- range2ip/build.sh | 6 +++--- range2ip/docker.sh | 6 +++--- range2ip/release.sh | 6 +++--- scripts/build-all-platforms.sh | 8 ++++---- scripts/build-archive-all.sh | 10 +++++----- scripts/build.sh | 8 ++++---- scripts/changelog.sh | 6 +++--- scripts/docker.sh | 12 ++++++------ scripts/fmt.sh | 28 ++++++++++++++-------------- scripts/release-ppa.sh | 8 ++++---- scripts/release.sh | 18 +++++++++--------- splitcidr/build-all-platforms.sh | 6 +++--- splitcidr/build.sh | 6 +++--- splitcidr/docker.sh | 6 +++--- splitcidr/release.sh | 6 +++--- 52 files changed, 181 insertions(+), 181 deletions(-) diff --git a/cidr2ip/build-all-platforms.sh b/cidr2ip/build-all-platforms.sh index 83f2627d..5b77927d 100755 --- a/cidr2ip/build-all-platforms.sh +++ b/cidr2ip/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "cidr2ip" $VSN +"$ROOT"/scripts/build-all-platforms.sh "cidr2ip" $VSN diff --git a/cidr2ip/build.sh b/cidr2ip/build.sh index 50fb527b..9cd7bb69 100755 --- a/cidr2ip/build.sh +++ b/cidr2ip/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "cidr2ip" +"$ROOT"/scripts/build.sh "cidr2ip" diff --git a/cidr2ip/docker.sh b/cidr2ip/docker.sh index 62a1cbbf..7a14ee8a 100755 --- a/cidr2ip/docker.sh +++ b/cidr2ip/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "cidr2ip" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "cidr2ip" $VSN $RELEASE diff --git a/cidr2ip/release.sh b/cidr2ip/release.sh index 4c971f2a..a3048799 100755 --- a/cidr2ip/release.sh +++ b/cidr2ip/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "cidr2ip" $VSN +"$ROOT"/scripts/release.sh "cidr2ip" $VSN diff --git a/cidr2range/build-all-platforms.sh b/cidr2range/build-all-platforms.sh index 1ad526ec..d07ae2f1 100755 --- a/cidr2range/build-all-platforms.sh +++ b/cidr2range/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "cidr2range" $VSN +"$ROOT"/scripts/build-all-platforms.sh "cidr2range" $VSN diff --git a/cidr2range/build.sh b/cidr2range/build.sh index d78b4605..1caff013 100755 --- a/cidr2range/build.sh +++ b/cidr2range/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "cidr2range" +"$ROOT"/scripts/build.sh "cidr2range" diff --git a/cidr2range/docker.sh b/cidr2range/docker.sh index 68454075..4aca39dd 100755 --- a/cidr2range/docker.sh +++ b/cidr2range/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "cidr2range" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "cidr2range" $VSN $RELEASE diff --git a/cidr2range/release.sh b/cidr2range/release.sh index bb995357..3a14d616 100755 --- a/cidr2range/release.sh +++ b/cidr2range/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "cidr2range" $VSN +"$ROOT"/scripts/release.sh "cidr2range" $VSN diff --git a/grepdomain/build-all-platforms.sh b/grepdomain/build-all-platforms.sh index 90c5e8e2..f8d1b9f6 100755 --- a/grepdomain/build-all-platforms.sh +++ b/grepdomain/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "grepdomain" $VSN +"$ROOT"/scripts/build-all-platforms.sh "grepdomain" $VSN diff --git a/grepdomain/build.sh b/grepdomain/build.sh index 3e2ff1cd..c4960759 100755 --- a/grepdomain/build.sh +++ b/grepdomain/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "grepdomain" +"$ROOT"/scripts/build.sh "grepdomain" diff --git a/grepdomain/docker.sh b/grepdomain/docker.sh index 5ba72f96..3df7ab9e 100755 --- a/grepdomain/docker.sh +++ b/grepdomain/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "grepdomain" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "grepdomain" $VSN $RELEASE diff --git a/grepdomain/release.sh b/grepdomain/release.sh index 3cc2ea05..13600f17 100755 --- a/grepdomain/release.sh +++ b/grepdomain/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "grepdomain" $VSN +"$ROOT"/scripts/release.sh "grepdomain" $VSN diff --git a/grepip/build-all-platforms.sh b/grepip/build-all-platforms.sh index 9eed2b51..e64ea1fd 100755 --- a/grepip/build-all-platforms.sh +++ b/grepip/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "grepip" $VSN +"$ROOT"/scripts/build-all-platforms.sh "grepip" $VSN diff --git a/grepip/build.sh b/grepip/build.sh index 3f3fa298..bcc3167d 100755 --- a/grepip/build.sh +++ b/grepip/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "grepip" +"$ROOT"/scripts/build.sh "grepip" diff --git a/grepip/docker.sh b/grepip/docker.sh index ca09c4f4..c2fb4a75 100755 --- a/grepip/docker.sh +++ b/grepip/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "grepip" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "grepip" $VSN $RELEASE diff --git a/grepip/release.sh b/grepip/release.sh index cecb153c..b38c3df6 100755 --- a/grepip/release.sh +++ b/grepip/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "grepip" $VSN +"$ROOT"/scripts/release.sh "grepip" $VSN diff --git a/ipinfo/build-all-platforms.sh b/ipinfo/build-all-platforms.sh index 48cbdf1d..ff3f7a81 100755 --- a/ipinfo/build-all-platforms.sh +++ b/ipinfo/build-all-platforms.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 LINUX_ONLY=$2 -$ROOT/scripts/build-all-platforms.sh "ipinfo" $VSN $LINUX_ONLY +"$ROOT"/scripts/build-all-platforms.sh "ipinfo" $VSN $LINUX_ONLY diff --git a/ipinfo/build.sh b/ipinfo/build.sh index 8cec0af8..599c3556 100755 --- a/ipinfo/build.sh +++ b/ipinfo/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "ipinfo" +"$ROOT"/scripts/build.sh "ipinfo" diff --git a/ipinfo/docker.sh b/ipinfo/docker.sh index 7b139456..afea96a1 100755 --- a/ipinfo/docker.sh +++ b/ipinfo/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "ipinfo" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "ipinfo" $VSN $RELEASE diff --git a/ipinfo/release.sh b/ipinfo/release.sh index 023bf3dd..21992dfe 100755 --- a/ipinfo/release.sh +++ b/ipinfo/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "ipinfo" $VSN +"$ROOT"/scripts/release.sh "ipinfo" $VSN diff --git a/matchip/build-all-platforms.sh b/matchip/build-all-platforms.sh index fdec3cb3..c48180eb 100755 --- a/matchip/build-all-platforms.sh +++ b/matchip/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "matchip" $VSN +"$ROOT"/scripts/build-all-platforms.sh "matchip" $VSN diff --git a/matchip/build.sh b/matchip/build.sh index e44c7ce1..a3234d02 100755 --- a/matchip/build.sh +++ b/matchip/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "matchip" +"$ROOT"/scripts/build.sh "matchip" diff --git a/matchip/docker.sh b/matchip/docker.sh index 9dc23393..fd614e3f 100755 --- a/matchip/docker.sh +++ b/matchip/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "matchip" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "matchip" $VSN $RELEASE diff --git a/matchip/release.sh b/matchip/release.sh index 93dd3f1c..6a509e67 100755 --- a/matchip/release.sh +++ b/matchip/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "matchip" $VSN +"$ROOT"/scripts/release.sh "matchip" $VSN diff --git a/prips/build-all-platforms.sh b/prips/build-all-platforms.sh index eb8005b1..fa0f0a73 100755 --- a/prips/build-all-platforms.sh +++ b/prips/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "prips" $VSN +"$ROOT"/scripts/build-all-platforms.sh "prips" $VSN diff --git a/prips/build.sh b/prips/build.sh index 1ca98449..f9126653 100755 --- a/prips/build.sh +++ b/prips/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "prips" +"$ROOT"/scripts/build.sh "prips" diff --git a/prips/docker.sh b/prips/docker.sh index d4de4cf6..a8fc4fcd 100755 --- a/prips/docker.sh +++ b/prips/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "prips" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "prips" $VSN $RELEASE diff --git a/prips/release.sh b/prips/release.sh index 427749bb..860cba6a 100755 --- a/prips/release.sh +++ b/prips/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "prips" $VSN +"$ROOT"/scripts/release.sh "prips" $VSN diff --git a/randip/build-all-platforms.sh b/randip/build-all-platforms.sh index 42c18bf4..5815dc9f 100755 --- a/randip/build-all-platforms.sh +++ b/randip/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "randip" $VSN +"$ROOT"/scripts/build-all-platforms.sh "randip" $VSN diff --git a/randip/build.sh b/randip/build.sh index f0f4051c..adfdcdd9 100755 --- a/randip/build.sh +++ b/randip/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "randip" +"$ROOT"/scripts/build.sh "randip" diff --git a/randip/docker.sh b/randip/docker.sh index f1732c06..69ee217e 100755 --- a/randip/docker.sh +++ b/randip/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "randip" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "randip" $VSN $RELEASE diff --git a/randip/release.sh b/randip/release.sh index 6b357928..8fddc3e0 100755 --- a/randip/release.sh +++ b/randip/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "randip" $VSN +"$ROOT"/scripts/release.sh "randip" $VSN diff --git a/range2cidr/build-all-platforms.sh b/range2cidr/build-all-platforms.sh index 97898bea..26cbbee9 100755 --- a/range2cidr/build-all-platforms.sh +++ b/range2cidr/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "range2cidr" $VSN +"$ROOT"/scripts/build-all-platforms.sh "range2cidr" $VSN diff --git a/range2cidr/build.sh b/range2cidr/build.sh index 609e738d..6f2bc3a4 100755 --- a/range2cidr/build.sh +++ b/range2cidr/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "range2cidr" +"$ROOT"/scripts/build.sh "range2cidr" diff --git a/range2cidr/docker.sh b/range2cidr/docker.sh index 7994047a..fcd11cc2 100755 --- a/range2cidr/docker.sh +++ b/range2cidr/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "range2cidr" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "range2cidr" $VSN $RELEASE diff --git a/range2cidr/release.sh b/range2cidr/release.sh index c0f388bc..b5c96bb5 100755 --- a/range2cidr/release.sh +++ b/range2cidr/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "range2cidr" $VSN +"$ROOT"/scripts/release.sh "range2cidr" $VSN diff --git a/range2ip/build-all-platforms.sh b/range2ip/build-all-platforms.sh index 92d62813..ca6f0ec7 100755 --- a/range2ip/build-all-platforms.sh +++ b/range2ip/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "range2ip" $VSN +"$ROOT"/scripts/build-all-platforms.sh "range2ip" $VSN diff --git a/range2ip/build.sh b/range2ip/build.sh index 88f75ef8..2184001d 100755 --- a/range2ip/build.sh +++ b/range2ip/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "range2ip" +"$ROOT"/scripts/build.sh "range2ip" diff --git a/range2ip/docker.sh b/range2ip/docker.sh index 472ac1bf..9e41f621 100755 --- a/range2ip/docker.sh +++ b/range2ip/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "range2ip" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "range2ip" $VSN $RELEASE diff --git a/range2ip/release.sh b/range2ip/release.sh index 8f18e55a..210c42cc 100755 --- a/range2ip/release.sh +++ b/range2ip/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "range2ip" $VSN +"$ROOT"/scripts/release.sh "range2ip" $VSN diff --git a/scripts/build-all-platforms.sh b/scripts/build-all-platforms.sh index e33ac1a0..7d2fcdcd 100755 --- a/scripts/build-all-platforms.sh +++ b/scripts/build-all-platforms.sh @@ -5,8 +5,8 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 VSN=$2 @@ -68,8 +68,8 @@ do echo "building ${output}" GOOS=$os GOARCH=$arch go build \ - -o $ROOT/build/${output} \ - $ROOT/${CLI} + -o "$ROOT"/build/${output} \ + "$ROOT"/${CLI} done wait diff --git a/scripts/build-archive-all.sh b/scripts/build-archive-all.sh index 5b8d4907..c8b8ae24 100755 --- a/scripts/build-archive-all.sh +++ b/scripts/build-archive-all.sh @@ -5,8 +5,8 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 VSN=$2 @@ -28,11 +28,11 @@ if [ ! -d "$CLI" ]; then fi # build -rm -f $ROOT/build/${CLI}_${VSN}* -$ROOT/${CLI}/build-all-platforms.sh "$VSN" "$LINUX_ONLY" +rm -f "$ROOT"/build/${CLI}_${VSN}* +"$ROOT"/${CLI}/build-all-platforms.sh "$VSN" "$LINUX_ONLY" # archive -cd $ROOT/build +cd "$ROOT"/build for t in ${CLI}_${VSN}_* ; do if [[ $t == ${CLI}_*_windows_* ]]; then zip -q ${t/.exe/.zip} $t diff --git a/scripts/build.sh b/scripts/build.sh index 66278144..2e031a9d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,11 +2,11 @@ # Build binary for cli $1. -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 go build \ - -o $ROOT/build/${CLI} \ - $ROOT/${CLI} + -o "$ROOT"/build/${CLI} \ + "$ROOT"/${CLI} diff --git a/scripts/changelog.sh b/scripts/changelog.sh index 85bcb505..6667862c 100755 --- a/scripts/changelog.sh +++ b/scripts/changelog.sh @@ -5,15 +5,15 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 VERSION=$2 found=0 -cat $ROOT/${CLI}/CHANGELOG.md | while IFS= read "line"; do +cat "$ROOT"/${CLI}/CHANGELOG.md | while IFS= read "line"; do # Find the version heading if [ $found -eq 0 ] && (echo "$line" | grep -q -E "^(#|##) $VERSION$"); then found=1 diff --git a/scripts/docker.sh b/scripts/docker.sh index 142bb999..fe20fec8 100755 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -7,8 +7,8 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 VSN=$2 @@ -27,14 +27,14 @@ fi # build # disable CGO to make static binary CGO_ENABLED=0 go build \ - -o $ROOT/${CLI}/build/$CLI \ - $ROOT/${CLI} + -o "$ROOT"/${CLI}/build/$CLI \ + "$ROOT"/${CLI} # docker container -docker build --tag ipinfo/$CLI:$VSN $ROOT/$CLI/ +docker build --tag ipinfo/$CLI:$VSN "$ROOT"/$CLI/ # cleanup -rm -r $ROOT/$CLI/build +rm -r "$ROOT"/$CLI/build if [ "$RELEASE" = "-r" ] || [ "$RELEASE" = "--release" ]; then # push on docker hub diff --git a/scripts/fmt.sh b/scripts/fmt.sh index 750d9efa..c7f14f9b 100755 --- a/scripts/fmt.sh +++ b/scripts/fmt.sh @@ -1,20 +1,20 @@ #!/bin/bash -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. # Format code in project. gofmt -w \ - $ROOT/lib \ - $ROOT/ipinfo \ - $ROOT/grepip \ - $ROOT/grepdomain \ - $ROOT/matchip \ - $ROOT/prips \ - $ROOT/cidr2range \ - $ROOT/range2cidr \ - $ROOT/range2ip \ - $ROOT/cidr2ip \ - $ROOT/splitcidr \ - $ROOT/randip + "$ROOT"/lib \ + "$ROOT"/ipinfo \ + "$ROOT"/grepip \ + "$ROOT"/grepdomain \ + "$ROOT"/matchip \ + "$ROOT"/prips \ + "$ROOT"/cidr2range \ + "$ROOT"/range2cidr \ + "$ROOT"/range2ip \ + "$ROOT"/cidr2ip \ + "$ROOT"/splitcidr \ + "$ROOT"/randip diff --git a/scripts/release-ppa.sh b/scripts/release-ppa.sh index 9579717a..0fcc5da3 100755 --- a/scripts/release-ppa.sh +++ b/scripts/release-ppa.sh @@ -2,8 +2,8 @@ # Build and to upload IPinfo offical PPA. -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 KEY=$2 @@ -19,11 +19,11 @@ if [ -z "$KEY" ]; then fi # building the package -cd $ROOT +cd "$ROOT" debuild -us -uc -S -d # signing the package -cd $ROOT/.. +cd "$ROOT"/.. debsign -k $KEY ipinfo_${VSN}.dsc ipinfo_${VSN}_source.changes # uploading the package to ppa diff --git a/scripts/release.sh b/scripts/release.sh index 6b84bb7a..83910e4c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -4,8 +4,8 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. CLI=$1 VSN=$2 @@ -26,15 +26,15 @@ if [ ! -d "$CLI" ]; then fi # build -$ROOT/scripts/build-archive-all.sh "$CLI" "$VSN" +"$ROOT"/scripts/build-archive-all.sh "$CLI" "$VSN" # release gh release create ${CLI}-${VSN} \ -R ipinfo/cli \ -t "${CLI}-${VSN}" \ - $ROOT/build/${CLI}_${VSN}*.tar.gz \ - $ROOT/build/${CLI}_${VSN}*.zip \ - $ROOT/build/${CLI}_${VSN}*.deb \ - $ROOT/${CLI}/macos.sh \ - $ROOT/${CLI}/windows.ps1 \ - $ROOT/${CLI}/deb.sh + "$ROOT"/build/${CLI}_${VSN}*.tar.gz \ + "$ROOT"/build/${CLI}_${VSN}*.zip \ + "$ROOT"/build/${CLI}_${VSN}*.deb \ + "$ROOT"/${CLI}/macos.sh \ + "$ROOT"/${CLI}/windows.ps1 \ + "$ROOT"/${CLI}/deb.sh diff --git a/splitcidr/build-all-platforms.sh b/splitcidr/build-all-platforms.sh index afa6d882..53cc704d 100755 --- a/splitcidr/build-all-platforms.sh +++ b/splitcidr/build-all-platforms.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/build-all-platforms.sh "splitcidr" $VSN +"$ROOT"/scripts/build-all-platforms.sh "splitcidr" $VSN diff --git a/splitcidr/build.sh b/splitcidr/build.sh index d9a45ec0..174f8364 100755 --- a/splitcidr/build.sh +++ b/splitcidr/build.sh @@ -4,7 +4,7 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. -$ROOT/scripts/build.sh "splitcidr" +"$ROOT"/scripts/build.sh "splitcidr" diff --git a/splitcidr/docker.sh b/splitcidr/docker.sh index 9ba7115d..c6f12433 100755 --- a/splitcidr/docker.sh +++ b/splitcidr/docker.sh @@ -5,10 +5,10 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 RELEASE=$2 -$ROOT/scripts/docker.sh "splitcidr" $VSN $RELEASE +"$ROOT"/scripts/docker.sh "splitcidr" $VSN $RELEASE diff --git a/splitcidr/release.sh b/splitcidr/release.sh index 79d6e3bb..4bba1ddb 100755 --- a/splitcidr/release.sh +++ b/splitcidr/release.sh @@ -4,9 +4,9 @@ set -e -DIR=`dirname $0` -ROOT=$DIR/.. +DIR=`dirname "$0"` +ROOT="$DIR"/.. VSN=$1 -$ROOT/scripts/release.sh "splitcidr" $VSN +"$ROOT"/scripts/release.sh "splitcidr" $VSN