From 24116107d1a55752a28281211c32c0c109e18f36 Mon Sep 17 00:00:00 2001
From: Max Rydahl Andersen <max@xam.dk>
Date: Sun, 29 Dec 2019 00:44:57 +0100
Subject: [PATCH] fix homebrew publish and force early error

---
 misc/updatebrew.sh                         | 8 ++++++--
 misc/updatesdkman.sh                       | 4 +++-
 src/main/scripts/jbang                     | 2 +-
 src/test/java/dk/xam/jbang/TestMain.java   | 1 -
 src/test/java/dk/xam/jbang/TestScript.java | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/misc/updatebrew.sh b/misc/updatebrew.sh
index b1d917eff..1fda0d521 100755
--- a/misc/updatebrew.sh
+++ b/misc/updatebrew.sh
@@ -1,6 +1,8 @@
 ########################################################################
 ### Update homebrew
 
+set -e
+
 jbang_version=`ls build/distributions/jbang-*.*.zip | sed -e 's/.*jbang-\(.*\).zip/\1/g'`
 echo "Updating jbang brew with version $jbang_version"
 DIST=`ls build/distributions/jbang-${jbang_version}.zip | cut -f1 -d ' '`
@@ -8,12 +10,14 @@ sha256=`cat $DIST.sha256`
 
 rm -rf homebrew-tap
 git clone https://github.com/maxandersen/homebrew-tap.git
+
+cp build/brew/formula/jbang.rb Formula/jbang.rb
+
 cd homebrew-tap
 
 git config user.name "Max Rydahl Andersen"
 git config user.email "max@xam.dk"
 
-cp ../build/brew/Formula/jbang.rb Formula/jbang.rb
 
 git add Formula/jbang.rb
 git commit -m "jbang v${jbang_version}"
@@ -24,5 +28,5 @@ echo $remote_repo
 git push "${remote_repo}" --follow-tags
 
 
-## to test use `brew install holgerbrandl/tap/kscript`
+## to test use `brew install maxandersen/tap/jbang`
 
diff --git a/misc/updatesdkman.sh b/misc/updatesdkman.sh
index dc70cf922..19db9f8af 100644
--- a/misc/updatesdkman.sh
+++ b/misc/updatesdkman.sh
@@ -1,9 +1,11 @@
 
+set -e
+
 jbang_version=`ls build/distributions/jbang-*.*.zip | sed -e 's/.*jbang-\(.*\).zip/\1/g'`
 echo "Updating jbang sdkman with version $jbang_version"
 
 
-echo ${SDKMAN_CONSUMER_KEY} ${SDKMAN_CONSUMER_TOKEN} ${kscript_version}
+echo ${SDKMAN_CONSUMER_KEY} ${SDKMAN_CONSUMER_TOKEN} ${jbang_version}
 #echo ${SDKMAN_CONSUMER_KEY} | cut -c-5
 #echo ${SDKMAN_CONSUMER_TOKEN} | cut -c-5
 
diff --git a/src/main/scripts/jbang b/src/main/scripts/jbang
index d5df2b78c..5fd56099b 100755
--- a/src/main/scripts/jbang
+++ b/src/main/scripts/jbang
@@ -29,5 +29,5 @@ if [[ -z "$JAVA_HOME" ]]; then JAVA_EXEC="java"; else JAVA_EXEC="$JAVA_HOME/bin/
 ## expose the name of the script being run to the script itself
 export JBANG_FILE="$1"
 
-## run it using command substitution to have just the user process once kscript is done
+## run it using command substitution to have just the user process once jbang is done
 eval "exec $(${JAVA_EXEC} -classpath ${jarPath} dk.xam.jbang.Main "$@")"
diff --git a/src/test/java/dk/xam/jbang/TestMain.java b/src/test/java/dk/xam/jbang/TestMain.java
index 70d2aaeeb..ed80f443e 100644
--- a/src/test/java/dk/xam/jbang/TestMain.java
+++ b/src/test/java/dk/xam/jbang/TestMain.java
@@ -88,5 +88,4 @@ void testDependencies() throws FileNotFoundException {
 		assertThat(result, containsString("log4j"));
 	}
 
-
 }
diff --git a/src/test/java/dk/xam/jbang/TestScript.java b/src/test/java/dk/xam/jbang/TestScript.java
index 4bcf54ca1..c48ab3c86 100644
--- a/src/test/java/dk/xam/jbang/TestScript.java
+++ b/src/test/java/dk/xam/jbang/TestScript.java
@@ -19,7 +19,7 @@ class TestScript {
 			+ "\t\t\t+ \"    jbang (-h | --help)\\n\" + \"\\n\" + \"Options:\\n\"\n"
 			+ "\t\t\t+ \"    -t, --text         Enable stdin support API for more streamlined text processing  [default: latest]\\n\"\n"
 			+ "\t\t\t+ \"    --package          Package script and dependencies into self-dependent binary\\n\"\n"
-			+ "\t\t\t+ \"    --idea             boostrap IDEA from a kscript\\n\"\n"
+			+ "\t\t\t+ \"    --idea             boostrap IDEA from a jbang\\n\"\n"
 			+ "\t\t\t+ \"    -i, --interactive  Create interactive shell with dependencies as declared in script\\n\"\n"
 			+ "\t\t\t+ \"    -                  Read script from the STDIN\\n\" + \"    -h, --help         Print this text\\n\"\n"
 			+ "\t\t\t+ \"    --clear-cache      Wipe cached script jars and urls\\n\" + \"\";\n" + "\n"