Merge pull request #2 from mohand1993/master

Use relative paths for calling scripts
venshine · Dec 14, 2023 · 4b69cc3 · 4b69cc3
2 parents d415aa3 + 1b44c90
commit 4b69cc3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/classyshark-apk.sh b/classyshark-apk.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
+SCRIPT_DIR="$(dirname "$0")"
+export SCRIPT_DIR
 
 # 校验参数合法性
-source util.sh
+source $SCRIPT_DIR/util.sh
 check $1
 
 # 得到新的目录
@@ -23,5 +25,5 @@ echo `pwd`
 echo "View the decompile file"
 
 # 执行ClassyShark命令
-#java -jar ../../tools/classyshark/ClassyShark.jar -export $absolutename
-java -jar ../../tools/classyshark/ClassyShark.jar -open $absolutename
+#java -jar $SCRIPT_DIR/tools/classyshark/ClassyShark.jar -export $absolutename
+java -jar $SCRIPT_DIR/tools/classyshark/ClassyShark.jar -open $absolutename
diff --git a/decompile-apk.sh b/decompile-apk.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+SCRIPT_DIR="$(dirname "$0")"
+export SCRIPT_DIR
 
 arg=$1
 
@@ -20,15 +22,15 @@ function input() {
 	case $input in
 		1)
 		## 执行jdgui-apk命令
-		sh jdgui-apk.sh $arg
+		sh $SCRIPT_DIR/jdgui-apk.sh $arg
 		;;
 		2)
 		## 执行classyshark-apk命令
-		sh classyshark-apk.sh $arg
+		sh $SCRIPT_DIR/classyshark-apk.sh $arg
 		;;
 		3)
 		## 执行jadx-apk命令
-		sh jadx-apk.sh $arg
+		sh $SCRIPT_DIR/jadx-apk.sh $arg
 		;;
 		4)
 		## 执行bytecode-viewer-apk命令
@@ -45,4 +47,4 @@ function input() {
 	esac
 }
 
-input true
+input true
diff --git a/jadx-apk.sh b/jadx-apk.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
+SCRIPT_DIR="$(dirname "$0")"
+export SCRIPT_DIR
 
 # 校验参数合法性
-source util.sh
+source $SCRIPT_DIR/util.sh
 check $1
 
 # 得到新的目录
@@ -12,7 +14,7 @@ rm -rf $newfoldername
 echo "View the decompile file"
 
 # 执行jadx命令
-#sh ../tools/jadx/bin/jadx -d $newfoldername $absolutename
+#sh $SCRIPT_DIR/tools/jadx/bin/jadx -d $newfoldername $absolutename
 
 # 执行jadx-gui命令
-sh ../tools/jadx/bin/jadx-gui $absolutename
+sh $SCRIPT_DIR/tools/jadx/bin/jadx-gui $absolutename
diff --git a/jdgui-apk.sh b/jdgui-apk.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
+SCRIPT_DIR="$(dirname "$0")"
+export SCRIPT_DIR
 
 # 校验参数合法性
-source util.sh
+source $SCRIPT_DIR/util.sh
 check $1
 
 # 得到新的目录
@@ -14,7 +16,7 @@ function isEmptyDir(){
 }
 
 # 执行apktool命令
-sh ../tools/apktool/apktool d -f $absolutename
+sh $SCRIPT_DIR/tools/apktool/apktool d -f $absolutename
 
 # 判断目录是否存在，不存在证明执行apktool命令出现异常
 if [ ! -d "$foldername" ];
@@ -38,7 +40,7 @@ cd $foldername
 echo `pwd`
 
 # 执行dex2jar命令
-sh ../../tools/dex2jar/d2j-dex2jar.sh $absolutename
+sh $SCRIPT_DIR/tools/dex2jar/d2j-dex2jar.sh $absolutename
 suffix="-dex2jar.jar"
 jarname=${foldername}${suffix}
 
@@ -61,4 +63,4 @@ echo ${pathname}
 echo "View the decompile file"
 
 # 执行jd-gui命令
-java -jar ../../tools/jd-gui/jd-gui.jar $jarname
+java -jar $SCRIPT_DIR/tools/jd-gui/jd-gui.jar $jarname