diff --git a/module/template/customize.sh b/module/template/customize.sh index 48d449b..0f203f6 100644 --- a/module/template/customize.sh +++ b/module/template/customize.sh @@ -60,6 +60,7 @@ fi . "$TMPDIR/verify.sh" extract "$ZIPFILE" 'customize.sh' "$TMPDIR/.vunzip" extract "$ZIPFILE" 'verify.sh' "$TMPDIR/.vunzip" +extract "$ZIPFILE" 'target.txt' "$TMPDIR" ui_print "- Extracting module files" extract "$ZIPFILE" 'module.prop' "$MODPATH" @@ -67,7 +68,6 @@ extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH" extract "$ZIPFILE" 'service.sh' "$MODPATH" extract "$ZIPFILE" 'service.apk' "$MODPATH" extract "$ZIPFILE" 'sepolicy.rule' "$MODPATH" -extract "$ZIPFILE" 'daemon' "$MODPATH" chmod +x "$MODPATH/daemon" mkdir "$MODPATH/zygisk" @@ -88,3 +88,14 @@ fi mv "$MODPATH/libinject.so" "$MODPATH/inject" chmod 755 "$MODPATH/inject" + +CONFIG_DIR=/data/adb/tricky_store +if [ ! -d $CONFIG_DIR ]; then + ui_print "- Creating configuration directory" + mkdir -p $CONFIG_DIR + if [ ! -f $CONFIG_DIR/target.txt ]; then + ui_print "- Adding default scope" + extract "$ZIPFILE" 'daemon' "$MODPATH" + mv "$TMPDIR/target.txt" + fi +fi diff --git a/module/template/target.txt b/module/template/target.txt new file mode 100644 index 0000000..f30b01b --- /dev/null +++ b/module/template/target.txt @@ -0,0 +1,4 @@ +com.google.android.gms +io.github.vvb2060.keyattestation +io.github.vvb2060.mahoshojo +icu.nullptr.nativetest diff --git a/service/src/main/java/io/github/a13e300/tricky_store/Config.kt b/service/src/main/java/io/github/a13e300/tricky_store/Config.kt index 7bb18e6..25e7467 100644 --- a/service/src/main/java/io/github/a13e300/tricky_store/Config.kt +++ b/service/src/main/java/io/github/a13e300/tricky_store/Config.kt @@ -9,12 +9,6 @@ import java.io.File object Config { private val hackPackages = mutableSetOf() private val generatePackages = mutableSetOf() - private val DEFAULT_TARGET_PACKAGES = listOf( - "com.google.android.gms", - "icu.nullptr.nativetest", - "io.github.vvb2060.mahoshojo", - "io.github.vvb2060.keyattestation" - ) private fun updateTargetPackages(f: File?) = runCatching { hackPackages.clear() @@ -59,12 +53,12 @@ object Config { fun initialize() { root.mkdirs() - val target = File(root, TARGET_FILE) - if (!target.exists()) { - target.createNewFile() - target.writeText(DEFAULT_TARGET_PACKAGES.joinToString("\n")) + val scope = File(root, TARGET_FILE) + if (scope.exists()) { + updateTargetPackages(scope) + } else { + Logger.e("target.txt file not found, please put it to $scope !") } - updateTargetPackages(target) val keybox = File(root, KEYBOX_FILE) if (!keybox.exists()) { Logger.e("keybox file not found, please put it to $keybox !")