diff --git a/uninstall.sh b/uninstall.sh index 29aa2ea..dfc744c 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,26 +1,16 @@ -# Variables -ARCH=$(getprop ro.product.cpu.abi) +MODDIR=${0%/*} -# Delete WebView User App -if [[ "$ARCH" = "armeabi-v7a" ]]; then - for WVUA in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do - WVUP=$(ls -R /data/app | grep "$WVUA" | grep -o -m 1 "/data/app/~~.*/") +# Uninstall WebView User App +for WVUA in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do + WVUP=$(pm dump "$WVUA" | grep "codePath=/data" | grep -o "/.*") if [[ -d "$WVUP" ]]; then - rm -rf $WVUP + pm uninstall $WVUA fi - done -else - for WVUA in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do - WVUP=$(ls -R /data/app | grep "$WVUA" | grep -o -m 1 "/data/app/$WVUA.*/") - if [[ -d "$WVUP" ]]; then - rm -rf $WVUP - fi - done -fi +done # Delete WebView User Data for WVD in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do if [ -d /data/data/"$WVD" ]; then rm -rf /data/data/$WVD fi -done +done \ No newline at end of file