From 7cff0719ffe550e1e4b1551ff69f680e0550fcec Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 13:47:31 -0400 Subject: [PATCH 01/15] =?UTF-8?q?=F0=9F=91=A3:=20=20Crear=20deb=20para=20d?= =?UTF-8?q?ebian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 48 ++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 1a220dc4..ed36e17c 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -1,29 +1,71 @@ -name: Build Jar +name: Build Jar and DEB on: push: branches: [ "master" ] pull_request: branches: [ "master" ] + workflow_dispatch: # ---> Para ejecutar desde la interfaz permissions: contents: read jobs: build: - runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Set up JDK 8 uses: actions/setup-java@v4 with: java-version: '8' distribution: 'temurin' + - uses: gradle/actions/setup-gradle@v4 + - name: Build with Gradle - run: ./gradlew fatJar + run: ./gradlew fatJar --no-daemon # --> Evitar algunos errores CI + + - name: Install dependencies for DEB packaging + run: | + sudo apt-get update + sudo apt-get install -y dh-make debhelper devscripts + + - name: Create DEB package structure + run: | + mkdir -p deb-package/usr/share/apkeditor + mkdir -p deb-package/usr/bin + mkdir -p deb-package/DEBIAN + chmod 755 deb-package + + # Copy the built jar + cp build/libs/*.jar deb-package/usr/share/apkeditor/apkeditor.jar + + # Create launcher script + echo '#!/bin/sh' > deb-package/usr/bin/apkeditor + echo 'java -jar /usr/share/apkeditor/apkeditor.jar "$@"' >> deb-package/usr/bin/apkeditor + chmod +x deb-package/usr/bin/apkeditor + + # Create control file + cat > deb-package/DEBIAN/control < + Description: APK Editor tool + A tool for editing APK files. + EOL + + - name: Build DEB package + run: | + dpkg-deb --build deb-package + mkdir -p artifacts + mv deb-package.deb artifacts/apkeditor_1.0-${{ github.run_number }}_all.deb + - uses: actions/upload-artifact@v4 with: name: APKEditor From a6cbcb7a715707275ada5b8ba95b9ec55c6deace Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 13:57:56 -0400 Subject: [PATCH 02/15] =?UTF-8?q?=F0=9F=91=A3:=20=20Crear=20deb=20para=20d?= =?UTF-8?q?ebian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index ed36e17c..8604a833 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -64,9 +64,13 @@ jobs: run: | dpkg-deb --build deb-package mkdir -p artifacts - mv deb-package.deb artifacts/apkeditor_1.0-${{ github.run_number }}_all.deb - - - uses: actions/upload-artifact@v4 + mv deb-package.deb artifacts/apkeditor_1.0-${{ github.run_number }}_all.deb + + - name: Upload artifacts + uses: actions/upload-artifact@v4 with: - name: APKEditor - path: build/libs + name: Build-Outputs-${{ github.run_id }} + path: | + build/libs/*.jar + artifacts/*.deb + From d0c9b0460c39e93de78be687d3f326378bc0887f Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 14:09:29 -0400 Subject: [PATCH 03/15] =?UTF-8?q?=F0=9F=91=A3:=20=20Crear=20deb=20para=20d?= =?UTF-8?q?ebian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 8604a833..3901472f 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -71,6 +71,11 @@ jobs: with: name: Build-Outputs-${{ github.run_id }} path: | - build/libs/*.jar - artifacts/*.deb - + build/libs + artifacts + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: APKEditor + path: build/libs From 26fd974c979612eb43d30107ebb56508b15e61dd Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 14:18:24 -0400 Subject: [PATCH 04/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 3901472f..03c95764 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -78,4 +78,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: APKEditor - path: build/libs + path: artifacts From 65820d32a71b0f108de3c8845003bb522016a2b3 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 14:28:39 -0400 Subject: [PATCH 05/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 03c95764..d33c63a2 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -64,18 +64,23 @@ jobs: run: | dpkg-deb --build deb-package mkdir -p artifacts - mv deb-package.deb artifacts/apkeditor_1.0-${{ github.run_number }}_all.deb + mv deb-package.deb artifacts/apkeditor_1.4-${{ github.run_number }}_all.deb - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: Build-Outputs-${{ github.run_id }} - path: | - build/libs - artifacts + name: DEBIAN-DEB-APKEDITOR + path: artifacts + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: TERMUX-DEB-APKEDITOR - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: APKEditor - path: artifacts + name: APKEDITOR.jar + path: build/libs + + From 332f5ac88ba114a189915d890df6154cbf4e7d76 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 15:18:10 -0400 Subject: [PATCH 06/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 78 +++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index d33c63a2..d6222498 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -33,51 +33,93 @@ jobs: sudo apt-get update sudo apt-get install -y dh-make debhelper devscripts - - name: Create DEB package structure + - name: Create DEB package structure DEBIAN run: | - mkdir -p deb-package/usr/share/apkeditor - mkdir -p deb-package/usr/bin - mkdir -p deb-package/DEBIAN - chmod 755 deb-package - + ################ DEBIAN ##################### + mkdir -p deb-package-debian/usr/share/apkeditor + mkdir -p deb-package-debian/usr/bin + mkdir -p deb-package-debian/DEBIAN + chmod 755 deb-package-debian + # Copy the built jar - cp build/libs/*.jar deb-package/usr/share/apkeditor/apkeditor.jar + cp build/libs/*.jar deb-package-debian/usr/share/apkeditor/apkeditor.jar # Create launcher script - echo '#!/bin/sh' > deb-package/usr/bin/apkeditor - echo 'java -jar /usr/share/apkeditor/apkeditor.jar "$@"' >> deb-package/usr/bin/apkeditor - chmod +x deb-package/usr/bin/apkeditor + echo '#!/bin/sh' > deb-package-debian/usr/bin/apkeditor + echo 'java -jar /usr/share/apkeditor/apkeditor.jar "$@"' >> deb-package-debian/usr/bin/apkeditor + chmod +x deb-package-debian/usr/bin/apkeditor # Create control file - cat > deb-package/DEBIAN/control < deb-package-debian/DEBIAN/control < + Maintainer: VictorH028 Description: APK Editor tool A tool for editing APK files. EOL + + - name: Create DEB package structure TERMUX + run: | + ############## TERMUX ############### + mkdir -p deb-package-termux/data/data/com.termux/files/usr/share/apkeditor + mkdir -p deb-package-termux/data/data/com.termux/files/usr/bin + mkdir -p deb-package-termux/DEBIAN + chmod 755 deb-package-termux + + # Copy the built jar + cp build/libs/*.jar deb-package-termux/data/com.termux/files/usr/share/apkeditor/apkeditor.jar + + # Create launcher script + # + cat > deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor < deb-package-termux/DEBIAN/control < + Description: APK Editor tool + A tool for editing APK files. + EOL + + - name: Build DEB package run: | - dpkg-deb --build deb-package + #### debian #### + dpkg-deb --build deb-package-debian mkdir -p artifacts - mv deb-package.deb artifacts/apkeditor_1.4-${{ github.run_number }}_all.deb - - - name: Upload artifacts + mv deb-package-debian.deb artifacts/apkeditor_1.4-${{ github.run_number }}_all.deb + #### termux #### + dpkg-deb --build deb-package-termux + mkdir -p artifacts1 + mv deb-package-termux.deb artifacts1/apkeditor_1.4-${{ github.run_number }}_all.deb + + + - name: Upload DEBIAN-DEB-APKEDITOR uses: actions/upload-artifact@v4 with: name: DEBIAN-DEB-APKEDITOR path: artifacts - - name: Upload artifacts + - name: Upload TERMUX-DEB-APKEDITOR uses: actions/upload-artifact@v4 with: name: TERMUX-DEB-APKEDITOR + path: artifacts1 - - name: Upload artifacts + - name: Upload APKEDITOR.jar uses: actions/upload-artifact@v4 with: name: APKEDITOR.jar From e420ee459efc491c9b5f28ee276bb6713ad3bf08 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 15:24:33 -0400 Subject: [PATCH 07/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index d6222498..c77ee3d5 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -70,7 +70,7 @@ jobs: chmod 755 deb-package-termux # Copy the built jar - cp build/libs/*.jar deb-package-termux/data/com.termux/files/usr/share/apkeditor/apkeditor.jar + cp build/libs/*.jar deb-package-termux/data/data/com.termux/files/usr/share/apkeditor/apkeditor.jar # Create launcher script # From 4cb96e59fde8354da07f6c3a8a8ee37ae4d7f1dd Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 15:49:14 -0400 Subject: [PATCH 08/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian=20y=20termux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 53 ++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index c77ee3d5..4f58139b 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -76,7 +76,56 @@ jobs: # cat > deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor < \(.*\)$") + if expr "x${newProg}" : 'x/' >/dev/null; then + prog="${newProg}" + else + progdir=$(dirname "${prog}") + prog="${progdir}/${newProg}" + fi + done + oldwd=$(pwd) + progdir=$(dirname "${prog}") + cd "${progdir}" + progdir=$(pwd) + prog="${progdir}"/$(basename "${prog}") + cd "${oldwd}" + + jarfile=apkeditor.jar + libdir="$PREFIX/share/apkeditor" + if [ ! -r "$libdir/$jarfile" ]; then + echo $(basename "$prog")": can't find $jarfile" + exit 1 + fi + + javaOpts="-Xmx512M -Dfile.encoding=utf-8" + + while expr "x$1" : 'x-J' >/dev/null; do + opt=$(expr "$1" : '-J\(.*\)') + javaOpts="${javaOpts} -${opt}" + shift + done + + if [ "$OSTYPE" = "cygwin" ]; then + jarpath=$(cygpath -w "$libdir/$jarfile") + else + jarpath="$libdir/$jarfile" + fi + + PATH=$PATH:$(pwd) + export PATH + + if [ -f "$1" ]; then + input_file="$1" + output_file="${input_file%.*}.apk" + exec java $javaOpts -jar "$jarpath" m -i "$input_file" -o "$output_file" + else + exec java $javaOpts -jar "$jarpath" "$@" + fi EOL @@ -122,7 +171,7 @@ jobs: - name: Upload APKEDITOR.jar uses: actions/upload-artifact@v4 with: - name: APKEDITOR.jar + name: APKEDITOR path: build/libs From a65ad122f904bd6850c2ffd062de860e0d873297 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 16:14:28 -0400 Subject: [PATCH 09/15] =?UTF-8?q?=F0=9F=91=A31.0:=20=20Crear=20deb=20para?= =?UTF-8?q?=20debian=20y=20termux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 4f58139b..bea8532f 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -79,7 +79,7 @@ jobs: prog="$0" while [ -h "${prog}" ]; do - newProg=$(/data/data/com.termux/files/usr/bin/ls -ld "${prog}" + newProg=$(/data/data/com.termux/files/usr/bin/ls -ld "${prog}") newProg=$(expr "${newProg}" : ".* -> \(.*\)$") if expr "x${newProg}" : 'x/' >/dev/null; then prog="${newProg}" From 8f182131ece3e4df2aeb345bff52d80ab88d44fb Mon Sep 17 00:00:00 2001 From: victorh028 Date: Sun, 13 Apr 2025 22:25:47 -0400 Subject: [PATCH 10/15] =?UTF-8?q?=F0=9F=91=A3:=20A=C3=B1adi=20plugin=20y?= =?UTF-8?q?=20actualize=20algunas=20tareas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9ab1b6e6..113262a2 100755 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ - +apply plugin: 'application' apply plugin: 'java' group 'com.reandroid.apkeditor' version '1.4.2' +mainClassName = 'com.reandroid.apkeditor.Main' + java { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -16,19 +18,20 @@ if (JavaVersion.current().isJava8Compatible()) { } } } + repositories { mavenCentral() } dependencies { //implementation("io.github.reandroid:ARSCLib:+") - compile(files("$rootProject.projectDir/libs/ARSCLib.jar")) + implementation(files("$rootProject.projectDir/libs/ARSCLib.jar")) // built from: https://github.com/REAndroid/smali-lib - compile(files("$rootProject.projectDir/libs/smali.jar")) + implementation(files("$rootProject.projectDir/libs/smali.jar")) // built from: https://github.com/REAndroid/JCommand - compile(files("$rootProject.projectDir/libs/JCommand.jar")) + implementation(files("$rootProject.projectDir/libs/JCommand.jar")) } processResources { @@ -40,19 +43,23 @@ processResources { javadoc { exclude('com/reandroid/test/**') } + jar { exclude('com/reandroid/test/**') duplicatesStrategy = DuplicatesStrategy.FAIL + manifest { + attributes 'Main-Class': mainClassName + } } task fatJar(type: Jar) { duplicatesStrategy = DuplicatesStrategy.EXCLUDE manifest { attributes( - 'Main-Class': 'com.reandroid.apkeditor.Main' + 'Main-Class': mainClassName ) } - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } with jar } From 202d716bc20383b5172b2f427d63df536088dc84 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Tue, 15 Apr 2025 01:39:48 -0400 Subject: [PATCH 11/15] =?UTF-8?q?=F0=9F=91=A3:=20Comparaciones=20inecesari?= =?UTF-8?q?as=20con=20`logger`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apkeditor/common/AndroidManifestHelper.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java b/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java index d8124fea..6e528b2c 100644 --- a/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java +++ b/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java @@ -71,8 +71,9 @@ public static void removeAttributeFromManifestByName(AndroidManifestBlock androi } return; } + // Antes hera un valor entero boolean removed = manifestElement.removeAttributesWithName(resourceName); - if (removed && logger != null) { + if (removed ) { logger.logMessage("Removed-attribute : " + resourceName); } } @@ -86,7 +87,7 @@ public static void removeAttributeFromManifestById(AndroidManifestBlock androidM return; } boolean removed = manifestElement.removeAttributesWithId(resourceId); - if (removed && logger != null) { + if (removed ) { logger.logMessage("Removed-attribute : " + HexUtil.toHex8("@0x", resourceId)); } } @@ -108,7 +109,7 @@ public static void removeAttributeFromManifestAndApplication(AndroidManifestBloc ResXmlElement applicationElement = manifestElement.getElement( AndroidManifest.TAG_application); - if(removed && logger != null) { + if(removed ) { logger.logMessage("Attributes on removed: " + HexUtil.toHex8("0x", resourceId) + " (" + nameForLogging + ")"); } @@ -116,7 +117,7 @@ public static void removeAttributeFromManifestAndApplication(AndroidManifestBloc return; } removed = applicationElement.removeAttributesWithId(resourceId); - if(removed && logger != null) { + if(removed ) { logger.logMessage("Attributes on removed: " + HexUtil.toHex8("0x", resourceId) + " (" + nameForLogging + ")"); } From 535bf90f2bf670ccaed7043fb57a5bff21ae4e3e Mon Sep 17 00:00:00 2001 From: victorh028 Date: Tue, 22 Apr 2025 17:09:08 -0400 Subject: [PATCH 12/15] =?UTF-8?q?=F0=9F=91=A3:=20Better=20logic=20for=20th?= =?UTF-8?q?e=20deb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 60 +++++++----------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index bea8532f..3f2df859 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -50,7 +50,7 @@ jobs: chmod +x deb-package-debian/usr/bin/apkeditor # Create control file - cat > deb-package-debian/DEBIAN/control < deb-package-debian/DEBIAN/control <<`EOL` Package: apkeditor Version: 1.4-${{ github.run_number }} Section: utils @@ -74,58 +74,24 @@ jobs: # Create launcher script # - cat > deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor < deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor <<`EOL` #!/data/data/com.termux/files/usr/bin/bash - prog="$0" - while [ -h "${prog}" ]; do - newProg=$(/data/data/com.termux/files/usr/bin/ls -ld "${prog}") - newProg=$(expr "${newProg}" : ".* -> \(.*\)$") - if expr "x${newProg}" : 'x/' >/dev/null; then - prog="${newProg}" - else - progdir=$(dirname "${prog}") - prog="${progdir}/${newProg}" - fi - done - oldwd=$(pwd) - progdir=$(dirname "${prog}") - cd "${progdir}" - progdir=$(pwd) - prog="${progdir}"/$(basename "${prog}") - cd "${oldwd}" - - jarfile=apkeditor.jar - libdir="$PREFIX/share/apkeditor" - if [ ! -r "$libdir/$jarfile" ]; then - echo $(basename "$prog")": can't find $jarfile" - exit 1 + JAR_PATH="/data/data/com.termux/files/usr/share/apkeditor/apkeditor.jar + if [ ! -f "$JAR_PATH" ]; then + echo "Error: I can't find apkeditor.jar en $JAR_PATH" >&2 + exit 1 fi - javaOpts="-Xmx512M -Dfile.encoding=utf-8" + JAVA_OPTS="-Xmx512M -Dfile.encoding=utf-8" - while expr "x$1" : 'x-J' >/dev/null; do - opt=$(expr "$1" : '-J\(.*\)') - javaOpts="${javaOpts} -${opt}" - shift - done + # Procesar argumentos -J (si los hay) + while [[ "$1" == -J* ]]; do + JAVA_OPTS="$JAVA_OPTS -${1#-J}" + shift + don - if [ "$OSTYPE" = "cygwin" ]; then - jarpath=$(cygpath -w "$libdir/$jarfile") - else - jarpath="$libdir/$jarfile" - fi - - PATH=$PATH:$(pwd) - export PATH - - if [ -f "$1" ]; then - input_file="$1" - output_file="${input_file%.*}.apk" - exec java $javaOpts -jar "$jarpath" m -i "$input_file" -o "$output_file" - else - exec java $javaOpts -jar "$jarpath" "$@" - fi + exec java $JAVA_OPTS -jar "$JAR_PATH" "$@" EOL From 594f861fdefb5684f26688a8d41f7c4639fede86 Mon Sep 17 00:00:00 2001 From: victorh028 Date: Tue, 22 Apr 2025 17:21:10 -0400 Subject: [PATCH 13/15] =?UTF-8?q?=F0=9F=91=A3:=20Better=20logic=20for=20th?= =?UTF-8?q?e=20deb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 3f2df859..59c4b1d6 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -50,7 +50,7 @@ jobs: chmod +x deb-package-debian/usr/bin/apkeditor # Create control file - cat > deb-package-debian/DEBIAN/control <<`EOL` + cat > deb-package-debian/DEBIAN/control < deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor <<`EOL` + cat > deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor < Date: Tue, 22 Apr 2025 18:00:41 -0400 Subject: [PATCH 15/15] =?UTF-8?q?=F0=9F=91=A3:=20Better=20logic=20for=20th?= =?UTF-8?q?e=20deb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle_build.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 08495aac..1655bf0e 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -77,21 +77,15 @@ jobs: cat > deb-package-termux/data/data/com.termux/files/usr/bin/apkeditor << 'EOF' #!/data/data/com.termux/files/usr/bin/bash - JAR_PATH="/data/data/com.termux/files/usr/share/apkeditor/apkeditor.jar + JAR_PATH="/data/data/com.termux/files/usr/share/apkeditor/apkeditor.jar" if [ ! -f "$JAR_PATH" ]; then echo "Error: I can't find apkeditor.jar en $JAR_PATH" >&2 exit 1 fi - JAVA_OPTS="-Xmx512M -Dfile.encoding=utf-8" + JAVA_OPTS="-Xmx512M " - # Procesar argumentos -J (si los hay) - while [[ "$1" == -J* ]]; do - JAVA_OPTS="$JAVA_OPTS -${1#-J}" - shift - don - - exec java $JAVA_OPTS -jar "$JAR_PATH" "$@" + exec java -jar $JAVA_OPTS "$JAR_PATH" "$@" EOF