Merge pull request #572 from nosada/fix-build-error-using-makefile

Make sure setting variable `DIR` before called on scripts/_build.sh
digitalocean · Sep 7, 2019 · 977c3d1 · 977c3d1
2 parents fa399f1 + 777acc8
commit 977c3d1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/_build.sh b/scripts/_build.sh
@@ -2,6 +2,10 @@
 
 set -euo pipefail
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
+OUT_D=${OUT_D:-${DIR}/builds}
+mkdir -p "$OUT_D"
+
 base="-X github.com/digitalocean/doctl."
 build="$("$DIR"/scripts/version.sh -c)"
 ldflags="${base}Build=${build}"
@@ -16,10 +20,6 @@ ldflags="${ldflags} ${base}Minor=${minor}"
 patch="$(echo "$version" | cut -d . -f3)"
 ldflags="${ldflags} ${base}Patch=${patch}"
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
-OUT_D=${OUT_D:-${DIR}/builds}
-mkdir -p "$OUT_D"
-
 (
   export GOOS=${GOOS:-linux}
   export GOARCH=${GOARCH:-amd64}