diff --git a/CHANGELOG.md b/CHANGELOG.md index 70b8c11..175888b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,3 +77,8 @@ ## [3.1] ### Changed - update apktool to 2.5.0 + +## [4.1] +### Changed +- update jadx to 1.3.2 +- use custom apktool diff --git a/README.md b/README.md index bffd213..d1e9e5a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Apkmod v4.0 +# Apkmod v4.1 ### Author : Lokesh @Hax4us ## _Steps For Installation_ 1. First goto home directory `cd $HOME` 2. Get the setup script `wget https://raw.githubusercontent.com/Hax4us/Apkmod/master/setup.sh` -3. Execute the script `sh setup.sh` +3. Execute the script `bash setup.sh` 4. Now you can execute command `apkmod` ## Usage : diff --git a/apkmod.sh b/apkmod.sh index b0ccc5c..eed26a9 100644 --- a/apkmod.sh +++ b/apkmod.sh @@ -252,7 +252,7 @@ update() { else ARGS=--without-alpine fi - wget https://raw.githubusercontent.com/Hax4us/Apkmod/master/setup.sh && sh setup.sh $ARGS + wget https://raw.githubusercontent.com/Hax4us/Apkmod/master/setup.sh && bash setup.sh $ARGS fi } diff --git a/setup.sh b/setup.sh index a4b0fbe..2f0e797 100644 --- a/setup.sh +++ b/setup.sh @@ -1,4 +1,4 @@ -#!/data/data/com.termux/files/usr/bin/sh +#!/data/data/com.termux/files/usr/bin/bash #colors red='\033[1;31m' @@ -9,6 +9,15 @@ ALPINEDIR="${PREFIX}/share/apkmod" BINDIR="${PREFIX}/bin" LIBDIR="${ALPINEDIR}/usr/lib" +APKTOOL_VERSION="2.6.1" +APKTOOL_URL="https://github.com/Hax4us/Apkmod/releases/download/v${APKTOOL_VERSION}/apktool-${APKTOOL_VERSION}.apk" + +JADX_VERSION="1.3.2" +JADX_URL=https://github.com/skylot/jadx/releases/download/v${JADX_VERSION}/jadx-${JADX_VERSION}.zip + +AAPT_URL="https://github.com/Hax4us/Apkmod/releases/download/v${APKTOOL_VERSION}/aapt_@ARCH@.tar.gz" + + detect_os() { if [ -e $BINDIR/termux-info ]; then OS=TERMUX @@ -56,27 +65,25 @@ install_deps() { armeabi|armeabi-v7a) ARCH=arm ;; - x86|i686) - ARCH=x86 - ;; - x86_64) - ARCH=x86_64 - ;; + #x86|i686) + # ARCH=x86 + # ;; + #x86_64) + # ARCH=x86_64 + # ;; *) printf "your device "$(uname -m)" is not supported yet" exit 1 ;; esac - aapturl=https://github.com/Hax4us/Hax4us.github.io/blob/master/files/aapt/$ARCH/aapt.tar.gz?raw=true - wget ${aapturl} -O aapt.tar.gz && tar -xf aapt.tar.gz -C ${LIBDIR} && rm aapt.tar.gz + wget ${AAPT_URL/@ARCH@/${ARCH}} -O aapt.tar.gz && tar -xf aapt.tar.gz -C ${LIBDIR} && rm aapt.tar.gz for i in aapt aapt2; do mv ${LIBDIR}/android/${i} ${ALPINEDIR}/usr/bin done - apktoolurl=https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.5.0.jar - wget ${apktoolurl} -O ${ALPINEDIR}/opt/apktool.jar + wget ${APKTOOL_URL} -O ${ALPINEDIR}/opt/apktool.jar wget https://github.com/hax4us/Apkmod/raw/master/apkmod.sh -O ${BINDIR}/apkmod chmod +x ${BINDIR}/apkmod chmod +x ${ALPINEDIR}/usr/bin/aapt @@ -170,11 +177,9 @@ do_patches() { } jadx() { - JADXVER=1.1.0 - JADXURL=https://github.com/skylot/jadx/releases/download/v${JADXVER}/jadx-$JADXVER.zip - wget $JADXURL - mkdir -p $ALPINEDIR/usr/lib/jadx - unzip jadx-$JADXVER.zip -d $ALPINEDIR/usr/lib/jadx + wget ${JADX_URL} + mkdir -p ${ALPINEDIR}/usr/lib/jadx + unzip jadx-${JADX_VERSION}.zip -d ${ALPINEDIR}/usr/lib/jadx } ##################