From 74dd9350a640f9362f581aa2928c55077a91744a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vorburger=20=E2=9B=91=EF=B8=8F?= Date: Thu, 14 Feb 2019 09:26:51 +0100 Subject: [PATCH] fix run-java.sh broken auto_detect_jar_file to really find WAR (#79) (#83) --- fish-pepper/run-java-sh/fp-files/run-java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fish-pepper/run-java-sh/fp-files/run-java.sh b/fish-pepper/run-java-sh/fp-files/run-java.sh index 06ece14..1a2635d 100644 --- a/fish-pepper/run-java-sh/fp-files/run-java.sh +++ b/fish-pepper/run-java-sh/fp-files/run-java.sh @@ -89,7 +89,7 @@ auto_detect_jar_file() { # NB: Find both (single) JAR *or* WAR local nr_jars="$(ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-' | wc -l | awk '{print $1}')" if [ "${nr_jars}" = 1 ]; then - ls 2>/dev/null *.jar *.war | grep -v '^original-' + ls 2>/dev/null | grep -e '.*\.jar$' -e '.*\.war$' | grep -v '^original-' exit 0 fi cd "${old_dir}"