diff --git a/README.md b/README.md index 72e9303..cd5296f 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ The official Magisk is dropping support to download online modules... So I made my own app to do that! :3 -**This app is not officially supported by Magisk or it's developers** +**This app is not officially supported by Magisk or its developers** -**The Modules shown in this app are not affiliated with this app** +**The modules shown in this app are not affiliated with this app** (Please contact repo owners instead) ## Requirements @@ -25,7 +25,7 @@ Note: This app may require the use of a VPN in countries with a state wide firew ## For users To install the app go to [releases](https://github.com/Fox2Code/FoxMagiskModuleManager/releases), -and download and install the latest `.apk` on to your device. +and download and install the latest `.apk` on your device. The app currently use these three repo as it's module sources, with it's benefits and drawback: (Note: Each module repo can be disabled in the settings of the app) @@ -79,6 +79,7 @@ It allow module developers to have a more customizable install experience For more information please check the [developer documentation](DEVELOPERS.md) ## For translators + See [`app/src/main/res/values/strings.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/strings.xml) and [`app/src/main/res/values/arrays.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/arrays.xml) diff --git a/app/build.gradle b/app/build.gradle index f58186c..cb71ef2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,25 @@ android { debuggable true } } + + flavorDimensions "type" + productFlavors { + "default" { + dimension "type" + buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "true" + } + + fdroid { + dimension "type" + applicationIdSuffix ".fdroid" + + // Need to disable auto-updater for F-Droid flavor because their inclusion policy + // forbids downloading blobs from third-party websites (and F-Droid APK isn't signed + // with our keys, so the APK wouldn't install anyways). + buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "false" + } + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d143063..01792e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,8 @@ + + diff --git a/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java b/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java index 4a043d7..fc3c635 100644 --- a/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java +++ b/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java @@ -24,6 +24,7 @@ public class AppUpdateManager { public static int FLAG_COMPAT_NO_EXT = 0x02; public static int FLAG_COMPAT_MAGISK_CMD = 0x04; public static int FLAG_COMPAT_NEED_32BIT = 0x08; + public static int FLAG_COMPAT_MALWARE = 0x10; private static final String TAG = "AppUpdateManager"; private static final AppUpdateManager INSTANCE = new AppUpdateManager(); private static final String RELEASES_API_URL = @@ -63,6 +64,8 @@ public class AppUpdateManager { // Return true if should show a notification public boolean checkUpdate(boolean force) { + if (!BuildConfig.ENABLE_AUTO_UPDATER) + return false; if (!force && this.peekShouldUpdate()) return true; long lastChecked = this.lastChecked; @@ -140,18 +143,26 @@ public class AppUpdateManager { .getBytes(StandardCharsets.UTF_8); this.parseCompatibilityFlags(new ByteArrayInputStream(rawData)); Files.write(compatFile, rawData); + if (!BuildConfig.ENABLE_AUTO_UPDATER) + this.lastCheckSuccess = true; } catch (Exception e) { + if (!BuildConfig.ENABLE_AUTO_UPDATER) + this.lastCheckSuccess = false; Log.e("AppUpdateManager", "Failed to update compat list", e); } } public boolean peekShouldUpdate() { + if (!BuildConfig.ENABLE_AUTO_UPDATER) + return false; return !(BuildConfig.VERSION_NAME.equals(this.latestRelease) || (this.preReleaseNewer && BuildConfig.VERSION_NAME.equals(this.latestPreRelease))); } public boolean peekHasUpdate() { + if (!BuildConfig.ENABLE_AUTO_UPDATER) + return false; return !BuildConfig.VERSION_NAME.equals(this.preReleaseNewer ? this.latestPreRelease : this.latestRelease); } @@ -187,6 +198,9 @@ public class AppUpdateManager { case "need32bit": value |= FLAG_COMPAT_NEED_32BIT; break; + case "malware": + value |= FLAG_COMPAT_MALWARE; + break; } } compatDataId.put(line.substring(0, i), value); diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index b27d4ea..611ec4a 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -178,9 +178,11 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O if (!NotificationType.NO_INTERNET.shouldRemove()) { moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET); } else { - if (AppUpdateManager.getAppUpdateManager().checkUpdate(true)) + // Compatibility data still needs to be updated + AppUpdateManager appUpdateManager = AppUpdateManager.getAppUpdateManager(); + if (BuildConfig.ENABLE_AUTO_UPDATER && appUpdateManager.checkUpdate(true)) moduleViewListBuilder.addNotification(NotificationType.UPDATE_AVAILABLE); - if (AppUpdateManager.getAppUpdateManager().isLastCheckSuccess()) + if (!BuildConfig.ENABLE_AUTO_UPDATER || appUpdateManager.isLastCheckSuccess()) AppUpdateManager.getAppUpdateManager().checkUpdateCompat(); if (max != 0) { int current = 0; diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java index e5bf6b0..391e6c1 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java @@ -137,7 +137,7 @@ public class AndroidacyActivity extends CompatActivity { private void onReceivedError(String url,int errorCode) { if ((url.startsWith("https://api.androidacy.com/magisk/") || - url.equals(pageUrl)) && (errorCode == 419 || errorCode == 429)) { + url.equals(pageUrl)) && (errorCode == 419 || errorCode == 429 || errorCode == 503)) { Toast.makeText(AndroidacyActivity.this, "Too many requests!", Toast.LENGTH_LONG).show(); AndroidacyActivity.this.runOnUiThread(AndroidacyActivity.this::onBackPressed); diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java index 88041cb..2609f4b 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java @@ -31,7 +31,7 @@ public class AndroidacyRepoData extends RepoData { if (this.metaDataCache.exists()) { this.androidacyBlockade = this.metaDataCache.lastModified() + 5_000L; if (this.androidacyBlockade - 10_000L > System.currentTimeMillis()) { - this.androidacyBlockade = 0; // Don't allow time travel + this.androidacyBlockade = 0; // Don't allow time travel. Well why not??? } } } @@ -78,7 +78,9 @@ public class AndroidacyRepoData extends RepoData { " path=/; secure; domain=.androidacy.com"); } catch (Exception e) { if ("Received error code: 419".equals(e.getMessage()) || - "Received error code: 429".equals(e.getMessage())) { + "Received error code: 429".equals(e.getMessage()) || + "Received error code: 503".equals(e.getMessage()) + ) { Log.e(TAG, "We are being rate limited!", e); this.androidacyBlockade = time + 3_600_000L; } diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java index 7500fed..cc3402b 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java @@ -219,7 +219,7 @@ public class AndroidacyWebAPI { this.forceQuitRaw("Non Androidacy module link used on Androidacy"); return; } - if (checksum != null) checksum = checksum.trim(); + checksum = Hashes.checkSumFormat(checksum); if (checksum == null || checksum.isEmpty()) { Log.w(TAG, "Androidacy WebView didn't provided a checksum!"); } else if (!Hashes.checkSumValid(checksum)) { @@ -261,7 +261,7 @@ public class AndroidacyWebAPI { this.forceQuitRaw("Non Androidacy module link used on Androidacy"); return; } - if (checksum != null) checksum = checksum.trim(); + checksum = Hashes.checkSumFormat(checksum); if (checksum == null || checksum.isEmpty()) { Log.w(TAG, "Androidacy WebView didn't provided a checksum!"); } else if (!Hashes.checkSumValid(checksum)) { diff --git a/app/src/main/java/com/fox2code/mmm/utils/Hashes.java b/app/src/main/java/com/fox2code/mmm/utils/Hashes.java index 15a5125..b470b55 100644 --- a/app/src/main/java/com/fox2code/mmm/utils/Hashes.java +++ b/app/src/main/java/com/fox2code/mmm/utils/Hashes.java @@ -5,10 +5,12 @@ import android.util.Log; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Locale; +import java.util.regex.Pattern; public class Hashes { private static final String TAG = "Hashes"; private static final char[] HEX_ARRAY = "0123456789abcdef".toCharArray(); + private static final Pattern nonAlphaNum = Pattern.compile("[^a-zA-Z0-9]"); public static String bytesToHex(byte[] bytes) { char[] hexChars = new char[bytes.length * 2]; for (int j = 0; j < bytes.length; j++) { @@ -65,6 +67,7 @@ public class Hashes { */ public static boolean checkSumMatch(byte[] data, String checksum) { String hash; + if (checksum == null) return false; switch (checksum.length()) { case 0: return true; // No checksum @@ -122,4 +125,10 @@ public class Hashes { return "SHA-512"; } } + + public static String checkSumFormat(String checksum) { + if (checksum == null) return null; + // Remove all non-alphanumeric characters + return nonAlphaNum.matcher(checksum.trim()).replaceAll(""); + } } diff --git a/app/src/main/res/values-es-rMX/arrays.xml b/app/src/main/res/values-es-rMX/arrays.xml new file mode 100644 index 0000000..ba414a5 --- /dev/null +++ b/app/src/main/res/values-es-rMX/arrays.xml @@ -0,0 +1,7 @@ + + + Sistema + Oscuro + Claro + + \ No newline at end of file diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml new file mode 100644 index 0000000..d295baf --- /dev/null +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -0,0 +1,96 @@ + + Fox\'s Magisk Module Manager + Fox\'s Mmm + No fue posible obtener acceso root o Magisk. + Cargando... + Actualización disponible + Instalado + Repositorio online + La aplicación está en modo Lockdown. + No fue posible descargar el archivo. + Los módulos tardaron mucho en iniciar, considere eliminar algunos. + No fue posible conectarse a Internet. + SettingsActivity + Actualización disponible + Actualizar + Sin descripción. + Descargar módulo + Instalar módulo + Actualizar módulo + Changelog + Sitio web + Soporte + Donar + Enviar un módulo + Requiere Android 6.0 o superior + + + Actualizado el: + Repositorio: + por + Descargas: + Estrellas: + + + + Administrar repositorios + Modo Lockdown + Modo Lockdown previene que la aplicación haga cambios en los módulos + Ajustes + Info + Mostrar licencias + Licencias + Mostrar módulos incompatibles + Muestra los módulos que son incompatibles con su dispositivo basandose en sus metadatos + Magisk está desactualizado! + Repositorios + Repositorio que aloja los módulos de Magisk + Una alternativa del repositorio de módulos de Magisk pero con menos restricciones. + Desea borrar los archivos del módulo? + Mantener archivos + Borrar archivos + No fue posible borrar los archivos del módulo + Tema + Modo del tema + Id del módulo: + Instalar módulo desde el almacenamiento + El módulo seleccionado tiene un formato inválido + Instalación local + Código fuente + Módulo incorporado de Magisk + Módulo incorporado de Substratum + Forzar el modo oscuro en la terminal + Su administrador de archivos no pudo dar acceso a los archivos. + Instalación remota + Su administrador de archivos retorno una respuesta no esperada. + Usar el comando de instalación de Magisk + + Durante las pruebas causó problemas a la herramienta de diagnóstico de errores de instalación de módulo, + así que escondí esta opción en el modo desarrollador, activala bajo tu propio riesgo! + + Modo desarrollador activado + Forzar el idioma al Inglés + Desactivar el filtro de módulos de baja calidad + + Algunos módulos no declaran de manera adecuada sus metadatos causando errores visuales + y/o indicando una mala calidad del módulo, desactivalo bajo su propio riesgo! + + DNS over HTTPS + + En algunos casos puede solucionar problemas de conexión + (No se aplica al WebView) + + Desactivar extensiones + + Desactiva las extensiones de Fox\'s Mmm, esto previene que los módulos usen + extensiones de la terminal, útil si un módulo hace mal uso de las extensiones de Fox\'s Mmm. + + Dividir el texto + + Divide el texto en una linea nueva en vez de colocar + todo el texto en la misma linea durante la instalación de un módulo + + Activar desenfoque + Repositorio activado + Repositorio desactivado + \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 0000000..b2cc8a2 --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,4 @@ +This app is not officially supported by Magisk or its developers. + +The modules shown in this app are not affiliated with this app. Please contact +repo owners instead. diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 0000000..7a9bd1f --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +A module manager for Magisk because the official app dropped support for it. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70b3ac1..84d1f85 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Sep 19 17:36:18 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # 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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@"