fix: error thrown for latest arch linux& update tools

classyshark-apk.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRIPT_DIR="$(dirname "$0")"
+SCRIPT_DIR="$(realpath $(dirname "$0"))"
 export SCRIPT_DIR
 
 # 校验参数合法性

decompile-apk.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRIPT_DIR="$(dirname "$0")"
+SCRIPT_DIR="$(realpath $(dirname "$0"))"
 export SCRIPT_DIR
 
 arg=$1

jadx-apk.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRIPT_DIR="$(dirname "$0")"
+SCRIPT_DIR="$(realpath $(dirname "$0"))"
 export SCRIPT_DIR
 
 # 校验参数合法性

jdgui-apk.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRIPT_DIR="$(dirname "$0")"
+SCRIPT_DIR="$(realpath $(dirname "$0"))"
 export SCRIPT_DIR
 
 # 校验参数合法性

tools/dex2jar/NOTICE.txt

@@ -3,6 +3,7 @@ Copyright (c) 2009-2014 Panxiaobo
 
 contributors
   - Bob Pan <pxb1988#gmail.com>
+  - HyperSpeeed <nico.mexis#kabelmail.de>
   - Enea Stanzani <aeneas.ltr#gmail.com>
   - t3stwhat <t3stwhat#gmail.com>
   - paulhooijenga <paulhooijenga#gmail.com>

tools/dex2jar/bin/dex-tools

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  dex-tools start up script for UN*X
@@ -64,7 +80,8 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.1.jar:$APP_HOME/lib/antlr4-runtime-4.5.jar:$APP_HOME/lib/d2j-smali-2.1-SNAPSHOT.jar:$APP_HOME/lib/dex-writer-2.1-SNAPSHOT.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/asm-debug-all-5.0.3.jar:$APP_HOME/lib/dex-translator-2.1-SNAPSHOT.jar:$APP_HOME/lib/dex-reader-2.1-SNAPSHOT.jar:$APP_HOME/lib/dx-23.0.0.jar:$APP_HOME/lib/dex-reader-api-2.1-SNAPSHOT.jar:$APP_HOME/lib/antlr4-4.5.jar:$APP_HOME/lib/dex-tools-2.1-SNAPSHOT.jar:$APP_HOME/lib/d2j-jasmin-2.1-SNAPSHOT.jar:$APP_HOME/lib/dex-ir-2.1-SNAPSHOT.jar:$APP_HOME/lib/d2j-base-cmd-2.1-SNAPSHOT.jar:$APP_HOME/lib/antlr-3.5.2.jar
+CLASSPATH=$APP_HOME/lib/dex-tools-v2.4.jar:$APP_HOME/lib/dex-translator-v2.4.jar:$APP_HOME/lib/dx-30.0.2.jar:$APP_HOME/lib/d2j-smali-v2.4.jar:$APP_HOME/lib/d2j-jasmin-v2.4.jar:$APP_HOME/lib/dex-writer-v2.4.jar:$APP_HOME/lib/d2j-base-cmd-v2.4.jar:$APP_HOME/lib/asm-util-9.5.jar:$APP_HOME/lib/asm-commons-9.5.jar:$APP_HOME/lib/asm-analysis-9.5.jar:$APP_HOME/lib/asm-tree-9.5.jar:$APP_HOME/lib/dex-reader-v2.4.jar:$APP_HOME/lib/dex-ir-v2.4.jar:$APP_HOME/lib/antlr4-4.9.3.jar:$APP_HOME/lib/antlr4-runtime-4.9.3.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.3.1.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/dex-reader-api-v2.4.jar:$APP_HOME/lib/asm-9.5.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.3.jar:$APP_HOME/lib/javax.json-1.0.4.jar:$APP_HOME/lib/icu4j-69.1.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $DEX_TOOLS_OPTS -classpath "\"$CLASSPATH\"" com.googlecode.dex2jar.tools.BaseCmd "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

tools/dex2jar/bin/dex-tools.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%..
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and DEX_TOOLS_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=
 
@@ -21,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\org.abego.treelayout.core-1.0.1.jar;%APP_HOME%\lib\antlr4-runtime-4.5.jar;%APP_HOME%\lib\d2j-smali-2.1-SNAPSHOT.jar;%APP_HOME%\lib\dex-writer-2.1-SNAPSHOT.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\asm-debug-all-5.0.3.jar;%APP_HOME%\lib\dex-translator-2.1-SNAPSHOT.jar;%APP_HOME%\lib\dex-reader-2.1-SNAPSHOT.jar;%APP_HOME%\lib\dx-23.0.0.jar;%APP_HOME%\lib\dex-reader-api-2.1-SNAPSHOT.jar;%APP_HOME%\lib\antlr4-4.5.jar;%APP_HOME%\lib\dex-tools-2.1-SNAPSHOT.jar;%APP_HOME%\lib\d2j-jasmin-2.1-SNAPSHOT.jar;%APP_HOME%\lib\dex-ir-2.1-SNAPSHOT.jar;%APP_HOME%\lib\d2j-base-cmd-2.1-SNAPSHOT.jar;%APP_HOME%\lib\antlr-3.5.2.jar
+set CLASSPATH=%APP_HOME%\lib\dex-tools-v2.4.jar;%APP_HOME%\lib\dex-translator-v2.4.jar;%APP_HOME%\lib\dx-30.0.2.jar;%APP_HOME%\lib\d2j-smali-v2.4.jar;%APP_HOME%\lib\d2j-jasmin-v2.4.jar;%APP_HOME%\lib\dex-writer-v2.4.jar;%APP_HOME%\lib\d2j-base-cmd-v2.4.jar;%APP_HOME%\lib\asm-util-9.5.jar;%APP_HOME%\lib\asm-commons-9.5.jar;%APP_HOME%\lib\asm-analysis-9.5.jar;%APP_HOME%\lib\asm-tree-9.5.jar;%APP_HOME%\lib\dex-reader-v2.4.jar;%APP_HOME%\lib\dex-ir-v2.4.jar;%APP_HOME%\lib\antlr4-4.9.3.jar;%APP_HOME%\lib\antlr4-runtime-4.9.3.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.3.1.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\dex-reader-api-v2.4.jar;%APP_HOME%\lib\asm-9.5.jar;%APP_HOME%\lib\org.abego.treelayout.core-1.0.3.jar;%APP_HOME%\lib\javax.json-1.0.4.jar;%APP_HOME%\lib\icu4j-69.1.jar
+
 
 @rem Execute dex-tools
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %DEX_TOOLS_OPTS%  -classpath "%CLASSPATH%" com.googlecode.dex2jar.tools.BaseCmd %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %DEX_TOOLS_OPTS%  -classpath "%CLASSPATH%" com.googlecode.dex2jar.tools.BaseCmd %*
 
 :end
 @rem End local scope for the variables with windows NT shell

tools/dex2jar/d2j-apk-sign.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ApkSign" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ApkSign" "$@"

tools/dex2jar/d2j-asm-verify.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.AsmVerify" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.AsmVerify" "$@"

tools/dex2jar/d2j-baksmali.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.d2j.smali.BaksmaliCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.d2j.smali.BaksmaliCmd" "$@"

tools/dex2jar/d2j-class-version-switch.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ClassVersionSwitch" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ClassVersionSwitch" "$@"

tools/dex2jar/d2j-decrypt-string.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DecryptStringCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DecryptStringCmd" "$@"

tools/dex2jar/d2j-dex-recompute-checksum.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DexRecomputeChecksum" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DexRecomputeChecksum" "$@"

tools/dex2jar/d2j-dex-weaver.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DexWeaverCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DexWeaverCmd" "$@"

tools/dex2jar/d2j-dex2jar.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Dex2jarCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Dex2jarCmd" "$@"

tools/dex2jar/d2j-dex2smali.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.d2j.smali.BaksmaliCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.d2j.smali.BaksmaliCmd" "$@"

tools/dex2jar/d2j-jar-access.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarAccessCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarAccessCmd" "$@"

tools/dex2jar/d2j-jar-weaver.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarWeaverCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarWeaverCmd" "$@"

tools/dex2jar/d2j-jar2dex.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Dex" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Dex" "$@"

tools/dex2jar/d2j-jar2jasmin.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.d2j.jasmin.Jar2JasminCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.d2j.jasmin.Jar2JasminCmd" "$@"

tools/dex2jar/d2j-jasmin2jar.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.d2j.jasmin.Jasmin2JarCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.d2j.jasmin.Jasmin2JarCmd" "$@"

tools/dex2jar/d2j-smali.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.d2j.smali.SmaliCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.d2j.smali.SmaliCmd" "$@"

tools/dex2jar/d2j-std-apk.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.StdApkCmd" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.StdApkCmd" "$@"

tools/dex2jar/d2j_invoke.bat

@@ -11,4 +11,4 @@ for %%X in ("%LIB%"\*.jar) do (
     set CP=!CP!%%X;
 )
 
-java -Xms512m -Xmx1024m -cp "%CP%" %*
+java -Xms512m -Xmx2048m -cp "%CP%" %*

tools/dex2jar/d2j_invoke.sh

@@ -45,4 +45,4 @@ else
     done
 fi
 
-java -Xms512m -Xmx1024m -classpath "${_classpath}" "$@"
+java -Xms512m -Xmx2048m -classpath "${_classpath}" "$@"