Revert "feat: Add Rish-based installer with signature verification and downgr…" (#162)

This reverts commit 3b7c563.

Author: decipher3114

.gitignore

@@ -5,4 +5,4 @@
 !install.sh
 !sources.json
 !modules/**
-!system/**
+!root/**

main.sh

@@ -54,7 +54,6 @@ main() {
 
 tput civis
 ROOT_ACCESS="$1"
-RISH_ACCESS="$2"
 
 for MODULE in $(find modules -type f -name "*.sh"); do
     source "$MODULE"

modules/patch.sh

@@ -62,7 +62,7 @@ patchApp() {
         '
     )
 
-    echo -e "Root Access: $ROOT_ACCESS\n Rish Access: $RISH_ACCESS\nArchitecture: $ARCH\nApp: $APP_NAME v$APP_VER\nCLI: $CLI_FILE\nPatches: $PATCHES_FILE\nArguments: ${ARGUMENTS[*]}\n\nLogs:\n" > "$STORAGE/patch_log.txt"
+    echo -e "Root Access: $ROOT_ACCESS\nArchitecture: $ARCH\nApp: $APP_NAME v$APP_VER\nCLI: $CLI_FILE\nPatches: $PATCHES_FILE\nArguments: ${ARGUMENTS[*]}\n\nLogs:\n" > "$STORAGE/patch_log.txt"
 
     java -jar "$CLI_FILE" patch \
         --force --exclusive --purge --patches="$PATCHES_FILE" \

modules/system/install.sh

@@ -4,8 +4,6 @@ installApp() {
     local CANONICAL_VER
     if [ "$ROOT_ACCESS" == true ]; then
         mountApp
-    elif [ "$RISH_ACCESS" == true ]; then
-        installAppRish
     else
         notify info "Copying patched $APP_NAME apk to Internal Storage..."
         CANONICAL_VER=${APP_VER//:/}

modules/system/rish.sh

@@ -3,15 +3,12 @@
 getInstalledVersion() {
     if [ "$ROOT_ACCESS" == true ] && su -c "pm list packages | grep -q $PKG_NAME"; then
         INSTALLED_VERSION=$(su -c dumpsys package "$PKG_NAME" | sed -n '/versionName/s/.*=//p' | sed -n '1p')
-    # We use pm list and dumpsys as fallback.
-    elif [ "$RISH_ACCESS" = true ] && ( rish -c "pm list packages --user current | grep -q $PKG_NAME" || ! rish -c "dumpsys package $PKG_NAME" 2>&1 | grep -q "Unable to find package:" ); then
-        INSTALLED_VERSION=$(rish -c "dumpsys package $PKG_NAME" | sed -n '/versionName/s/.*=//p' | sed -n '1p')
     fi
 }
 
 mountApp() {
     notify info "Please Wait !!\nMounting $APP_NAME..."
-    if su -mm -c "/system/bin/sh system/mount.sh $PKG_NAME $APP_NAME $APP_VER $SOURCE" &> /dev/null; then
+    if su -mm -c "/system/bin/sh root/mount.sh $PKG_NAME $APP_NAME $APP_VER $SOURCE" &> /dev/null; then
         notify msg "$APP_NAME Mounted Successfully !!"
     else
         notify msg "Installation Failed !!\nShare logs to developer."
@@ -42,7 +39,7 @@ umountApp() {
     ); then
         return
     fi
-    su -mm -c "/system/bin/sh system/umount.sh $PKG_NAME" &> /dev/null
+    su -mm -c "/system/bin/sh root/umount.sh $PKG_NAME" &> /dev/null
     notify msg "Unmount Successful !!"
     unset MOUNTED_PKGS PKG_NAME
 }

modules/system/root.sh

@@ -10,11 +10,10 @@ Options:
 -f:  Force re-install Revancify
 -u:  Disable Update Check
 -r:  Disable Root access
--R:  Disable Rish access
 -v:  Print current version
 -h:  Print help statement"
 
-while getopts ":furRvh" OPT 2> /dev/null; do
+while getopts ":furvh" OPT 2> /dev/null; do
     case $OPT in
         f)
             rm "$SRC/.info" &> /dev/null
@@ -25,9 +24,6 @@ while getopts ":furRvh" OPT 2> /dev/null; do
         r)
             ROOT_ACCESS=false
             ;;
-        R)
-            RISH_ACCESS=false
-            ;;
         v)
             if [ -e "$SRC" ]; then
                 source "$SRC/.info"
@@ -166,18 +162,13 @@ fetchSrc
 
 if [ "$ROOT_ACCESS" != false ] && su -c 'exit' &> /dev/null; then
     ROOT_ACCESS=true
-    RISH_ACCESS=false
-elif [ "$RISH_ACCESS" != false ] && rish -c 'exit' &> /dev/null; then
-    ROOT_ACCESS=false
-    RISH_ACCESS=true
 else
     ROOT_ACCESS=false
-    RISH_ACCESS=false
 fi
 
 cd "$SRC" &> /dev/null || terminate
 
-bash main.sh "$ROOT_ACCESS" "$RISH_ACCESS"
+bash main.sh "$ROOT_ACCESS"
 EXIT_CODE=$?
 
 exit "$EXIT_CODE"