diff --git a/resources/ffdec.sh b/resources/ffdec.sh old mode 100644 new mode 100755 index 1be5e60ab..eb103789b --- a/resources/ffdec.sh +++ b/resources/ffdec.sh @@ -8,9 +8,17 @@ REQ_JVER1=1 REQ_JVER2=7 REQ_JVER3=0 REQ_JVER4=0 -JAR_FILE=ffdec.jar 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 + [ -r "$f" ] && JAR_FILE="$f" && return 0 + done + echo Unable to find ffdec.jar in ${JAR_FILE_CANDIDATES[@]} + return 1 +} + check_java_version () { JVER1=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "\([0-9]*\)\.[0-9]*\.[0-9]*_[0-9]*".*/\1/'` JVER2=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.\([0-9]*\)\.[0-9]*_[0-9]*".*/\1/'` @@ -49,6 +57,8 @@ while [ -L "$PROGRAM" ]; do done cd "`dirname \"$PROGRAM\"`" +search_jar_file || exit 1 + # Check default java if [ -x "`which java`" ]; then JAVA_VERSION_OUTPUT=`java -version 2>&1`