update to nano 7.0, recovery script fixes

Author: osm0sis

bin/nano.bin

@@ -1,7 +1,7 @@
 id=nano-ndk
 name=Nano for Android NDK
-version=6.4
-versionCode=6400
+version=7.0
+versionCode=7000
 author=osm0sis @ xda-developers
 description=Static ARM nano binary for Android built with the NDK
 updateJson=https://raw.githubusercontent.com/Magisk-Modules-Repo/nano-ndk/master/update.json

module.prop

@@ -15,21 +15,20 @@ if [ "$suimg" ]; then
     minorx=1;
     [ -e /dev/block/loop1 ] && minorx=$(ls -l /dev/block/loop1 | cut -d, -f2 | cut -c4);
     i=0;
-    while [ $i -lt 16 ]; do
+    while [ $i -lt 64 ]; do
       loop=/dev/block/loop$i;
-      if [ ! -b $loop ]; then
-        mknod $loop b 7 $((i * minorx));
-      fi;
-      losetup $loop $suimg 2>/dev/null && break;
+      [ -e $loop ] || mknod $loop b 7 $((num * minorx));
+      losetup $loop $suimg 2>/dev/null;
       i=$((i + 1));
+      losetup $loop | grep -q $suimg && break;
     done;
-    mount -t ext4 -o loop,noatime $loop $mnt 2>/dev/null;
+    mount -t ext4 -o loop,noatime $loop $mnt;
     if [ $? != 0 ]; then
       losetup -d $loop 2>/dev/null;
     fi;
   fi;
   [ $mnt == /magisk ] && magisk=/nano-ndk/system;
-  [ -e $magisk/product ] && magisk=/nano-ndk/system/product;
+  [ -e $magisk/product ] && magisk=$magisk/product;
   etc=$mnt$magisk/etc;
   bin=$mnt$magisk/bin;
 else
@@ -47,7 +46,8 @@ else
     [ -f /system/system/build.prop ] && system=/system/system;
     [ -e $system/product/bin/nano ] && system=$system/product;
     etc=$system/etc;
-    bin=$system/xbin;
+    bin=$system/bin;
+    [ -e $system/xbin ] && bin=$system/xbin;
   fi;
 fi;
 

sbin/nano

@@ -1,6 +1,6 @@
 {
-    "version": "6.4",
-    "versionCode": "6400",
-    "zipUrl": "https://forum.xda-developers.com/attachments/update-nano-terminal-editor-v6-4-signed-zip.5760595/",
+    "version": "7.0",
+    "versionCode": "7000",
+    "zipUrl": "https://forum.xda-developers.com/attachments/update-nano-terminal-editor-v7-0-signed-zip.5766437/",
     "changelog": "https://raw.githubusercontent.com/Magisk-Modules-Repo/nano-ndk/master/README.md"
 }