v5.2.2

action.sh

@@ -15,21 +15,23 @@ if [ $? -ne 0 ]; then
 fi
 
 # Download the hosts file and save it as "hosts"
-wget -O /sdcard/hosts https://hosts.ubuntu101.co.za/hosts
+        curl -o /sdcard/hosts1 https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+        curl -o /sdcard/hosts2 https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/ultimate-compressed.txt
 
 echo "       Preparing New weapons🔫..."
 {
-    for j_cole in /system/etc/hosts /sdcard/hosts ; do
+    for j_cole in /system/etc/hosts /sdcard/hosts1 /sdcard/hosts2 ; do
         cat $j_cole
         echo ""
     done
 } | sort | uniq > /data/adb/modules/Re-Malwack/system/etc/hosts
 
 # let's see if the file was downloaded or not.
-if [ ! -f "/sdcard/hosts" ]; then
+if [ ! -f "/sdcard/hosts1" ]; then
     echo "       Looks like there is a problem with some weapons, maybe check your internet connection?"
 else 
     echo "       Everthing is fine now, Enjoy 😉"
-    rm /sdcard/hosts
+    rm /sdcard/hosts1
+    rm /sdcard/hosts2
     sleep 1.5
 fi

changelog.md

@@ -1,3 +1,9 @@
+## v5.2.2
+- 🎯 Fix update bug where conflicts checker thinks the module conflicts itself (Thanks for @GalaxyA14User @ Github)
+- ✨ enhanced conflicts checker
+- 🔁 Using curl instead of wget in action.sh
+- 😄 Last but not the least: Enhanced ad blocking experience, and hosts file is now smaller, it mustn't affect device perfomance.
+
 ## v5.2.1-hotfix
 - 🎯 Fix extraction error
 ## v5.2.1

common/install.sh

@@ -51,6 +51,8 @@ if [ "$DO_WE_REALLY_NEED_ADDONS" == "true" ]; then
 fi
 
 #checking for conflicts
+ui_print "     Checking for conflicts"
+
 abort() { echo "$1" && exit 1;}
 
 mods=$(sudo find /data/adb/modules | grep /system/etc/hosts | grep -v 'Re-Malwack' | grep -oP '(?<=/data/adb/modules/)[^/]+' | sort | uniq)
@@ -59,13 +61,13 @@ apps=$(pm list packages | grep 'org.adaway' | sed 's/package://')
 nah() {
   [ "$1" = 0 ] && { a='mods' && b="$mods";} ||\
                   { a='apps' && b="$apps";}
-  echo "- error! conflicts found,"\
+  echo "     Error! conflicts found,"\
        "please uninstall the following $a first:\n$b"
 }
 
 [ ! -z "$mods" ] && abort "$(nah 0)"
 [ ! -z "$apps" ] && abort "$(nah 1)"
-echo '- all good!'
+echo "     All good!"
 
 # make an bool to prevent extracting things if we dont have anything to extract...
 if [ "$DO_WE_HAVE_ANYTHING_TO_EXTRACT" == "true" ]; then
@@ -81,13 +83,14 @@ if ! ping -w 3 google.com &>/dev/null; then
 fi
 # Download the hosts file and save it as "hosts"
 ui_print "     Preparing Shields 🛡️..."
-wget https://hosts.ubuntu101.co.za/hosts
+wget -O hosts1 https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/ultimate-compressed.txt
+wget -O hosts2 https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
 
 # merge bombs to get a big nuke
 mkdir -p $MODPATH/system/etc
 ui_print "     Preparing weapons to kill malware🔫..."
 {
-    for j_cole in /system/etc/hosts hosts; do
+    for j_cole in /system/etc/hosts hosts1 hosts2; do
         cat $j_cole
         echo ""
     done

module.prop

@@ -1,8 +1,8 @@
 id=Re-Malwack
 name=Re-Malwack | Protection-maxxing 🛡️
-version=v5.2.1-hotfix
-versionCode=20241123
-author=ZG089 | Github : @ZG089 | Telegram : @zgx_dev
+version=v5.2.2
+versionCode=20241125
+author=ZG089 | Github : @ZG089 - Telegram : @zgx_dev
 description=Protecting your device from ads, Malware, p*rn, and more :) 
 updateJson=https://raw.githubusercontent.com/ZG089/Re-Malwack/main/update.json
 support=https://xdaforums.com/t/re-malwack-revival-of-malwack-module.4690049/

system/bin/rmlwk

@@ -116,9 +116,11 @@ case "$(tolower "$1")" in
     --update-hosts)
         echo "- Downloading update.."
         sleep 0.5
-        curl -o /data/local/tmp/hosts "https://hosts.ubuntu101.co.za/hosts" &>/dev/null || abort "Failed to download hosts file."
+
+        curl -o /data/local/tmp/hosts1 https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+        curl -o /data/local/tmp/hosts2 "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/ultimate-compressed.txt" &>/dev/null || abort "Failed to download hosts file."
         echo "- Applying update."
-        cat /data/local/tmp/hosts "$hosts_file" | sort | uniq > "$hosts_file"
+        cat /data/local/tmp/hosts1 /data/local/tmp/hosts2 "$hosts_file" | sort | uniq > "$hosts_file"
         echo "- Done."
         ;;
     --help|-h|*)

update.json

@@ -1,6 +1,6 @@
 {
-  "version": "v5.2.1-hotfix",
-  "versionCode": 20241123,
-  "zipUrl": "https://github.com/ZG089/Re-Malwack/releases/download/v5.2.1-hotfix/Re-Malwack-v5.2.1-hotfix.zip",
+  "version": "v5.2.2",
+  "versionCode": 20241125,
+  "zipUrl": "https://github.com/ZG089/Re-Malwack/releases/download/v5.2.2/Re-Malwack-v5.2.2.zip",
   "changelog": "https://raw.githubusercontent.com/ZG089/Re-Malwack/main/changelog.md"
 }