From fa3cecb156df1a03a1efe034b809980ab91799ce Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Fri, 6 Mar 2015 16:22:06 +0800 Subject: [PATCH] ffdec.sh: refactored error messages when ffdec.jar not found --- resources/ffdec.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/ffdec.sh b/resources/ffdec.sh index eb103789b..a12a13660 100755 --- a/resources/ffdec.sh +++ b/resources/ffdec.sh @@ -11,11 +11,12 @@ REQ_JVER4=0 MEMORY=1024m search_jar_file() { - JAR_FILE_CANDIDATES=('ffdec.jar' '../dist/ffdec.jar' '/usr/share/java/jpexs-decompiler/ffdec.jar') - for f in "${JAR_FILE_CANDIDATES[@]}" ; do + JAR_FILE_CANDIDATES='./ffdec.jar ../dist/ffdec.jar /usr/share/java/ffdec.jar /usr/share/java/jpexs-decompiler/ffdec.jar' + for f in "$JAR_FILE_CANDIDATES" ; do [ -r "$f" ] && JAR_FILE="$f" && return 0 done - echo Unable to find ffdec.jar in ${JAR_FILE_CANDIDATES[@]} + echo Unable to find ffdec.jar in the following locations: + echo "${JAR_FILE_CANDIDATES// /$'\n'}" return 1 }