Update apktool to 2.0.0rc2 and unify linux and osx versions

lxdvs · Nov 6, 2014 · ca7ec83 · ca7ec83
1 parent f439663
commit ca7ec83
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 85 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
-apktool
 .idea
 **/.DS_Store
diff --git a/apk2gold b/apk2gold
@@ -1,7 +1,7 @@
 #!/bin/sh
 MPATH=`dirname $0`
 FOLDER=`echo $1 | sed -e 's/\.apk//g'`
-$MPATH/osx/apktool d -f $1
+$MPATH/apktool/apktool d -f $1
 mkdir $FOLDER/src
 mv $FOLDER/smali $FOLDER/.smali
 $MPATH/dex2jar-0.0.9.12/dex2jar.sh $1

diff --git a/linux/apktool → apktool/apktool b/linux/apktool → apktool/apktool
diff --git a/apktool/apktool.jar b/apktool/apktool.jar
diff --git a/linux/aapt b/linux/aapt
diff --git a/linux/apktool.jar b/linux/apktool.jar
diff --git a/make.sh b/make.sh
@@ -11,7 +11,6 @@ then
 	else
 		make osx32
 	fi
-	cd ..
 	ln -s ./osx/apktool apktool
 elif [[ "$SYS" = "Linux" ]]
 then
@@ -21,7 +20,6 @@ then
 	else
 		make linux32
 	fi
-	cd ..
-	ln -s ./linux/apktool apktool
 fi
+cd ..
 pwd
diff --git a/osx/aapt b/osx/aapt
diff --git a/osx/apktool b/osx/apktool
diff --git a/osx/apktool.jar b/osx/apktool.jar