diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh index 313171b..d8b8791 100644 --- a/module/common/get_extra.sh +++ b/module/common/get_extra.sh @@ -47,11 +47,28 @@ check_update() { REMOTE_VERSION=$(echo "$JSON" | grep -o '"versionCode": *[0-9]*' | awk -F: '{print $2}' | tr -d ' ') LOCAL_VERSION=$(grep -o 'versionCode=[0-9]*' "$MODPATH/update/module.prop" | awk -F= '{print $2}') if [ "$REMOTE_VERSION" -gt "$LOCAL_VERSION" ]; then - echo "update" + if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then + [ -d "/data/adb/modules/TA_utl" ] && rm -rf "/data/adb/modules/TA_utl" + cp -rf "$MODPATH/update" "/data/adb/modules/TA_utl" + else + cp -f "$MODPATH/update/module.prop" "/data/adb/modules/TA_utl/module.prop" + fi + echo "update" fi fi } +uninstall() { + if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then + [ -d "/data/adb/modules/TA_utl" ] && rm -rf "/data/adb/modules/TA_utl" + cp -rf "$MODPATH/update" "/data/adb/modules/TA_utl" + else + cp -f "$MODPATH/update/module.prop" "/data/adb/modules/TA_utl/module.prop" + fi + touch "/data/adb/modules/TA_utl/remove" +} + + case "$1" in --kb) get_kb @@ -69,4 +86,8 @@ case "$1" in check_update exit ;; +--uninstall) + uninstall + exit + ;; esac diff --git a/module/install_func.sh b/module/install_func.sh index 72da566..67283b5 100644 --- a/module/install_func.sh +++ b/module/install_func.sh @@ -16,10 +16,7 @@ initialize() { fi #Set specific path - sed -i "s|\"set-path\"|\"/data/adb/modules/$NEW_MODID/\"|" "$MODPATH/webui/index.js" || { - ui_print "! Failed to set path" - abort - } + sed -i "s|\"set-path\"|\"/data/adb/modules/$NEW_MODID/\"|" "$MODPATH/webui/js/main.js" || abort "! Failed to set path" # Set aapt binary cp "$MODPATH/module.prop" "$COMPATH/update/module.prop" diff --git a/module/webui/index.html b/module/webui/index.html index 658ab03..59e8612 100644 --- a/module/webui/index.html +++ b/module/webui/index.html @@ -9,7 +9,7 @@ - + @@ -27,15 +27,7 @@ -
- - - - - - - -
+
@@ -63,7 +55,9 @@