Update chr.sh

Signed-off-by: elseif <elseif@live.cn>

.github/workflows/mikrotik_patch_6.yml

@@ -212,8 +212,8 @@ jobs:
         fi
         sudo cp -f system-$LATEST_VERSION.npk ./new_iso/
         sudo -E python3 patch.py kernel ./new_iso/isolinux/initrd.rgz
-        sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
-        sudo cp option-$LATEST_VERSION.npk ./new_iso/
+        # sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
+        # sudo cp option-$LATEST_VERSION.npk ./new_iso/
         sudo mkisofs -o mikrotik-$LATEST_VERSION.iso \
                     -V "MikroTik $LATEST_VERSION" \
                     -sysid "" -preparer "MiKroTiK" \
@@ -291,8 +291,8 @@ jobs:
         sudo cp ./all_packages/dude-$LATEST_VERSION.npk ./chr/var/pdb/dude/image
         sudo -E python3 patch.py npk ./chr/var/pdb/routeros-x86/image
         sudo cp ./chr/var/pdb/routeros-x86/image ./all_packages/routeros-x86-$LATEST_VERSION.npk
-        sudo mkdir -p ./chr/var/pdb/option
-        sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
+        # sudo mkdir -p ./chr/var/pdb/option
+        # sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
         sudo umount ./chr
         sudo qemu-nbd -d /dev/nbd0
         sudo rm -rf ./chr

README.md

@@ -22,7 +22,7 @@ graph TD
     B -->|否| D[检查 rc.local 文件是否存在]
     C --> D
     D -->|是| E[fork 执行 /bin/sh rc.local]
-    D -->|否| F[结束]
+    D -->|否| F[启动服务]
     E --> F
 ```
 ![](image/install.png)

chr.sh

@@ -3,26 +3,41 @@ set -e
 LATEST_VERSION="${1:-7.19.4}"
 echo "VERSION: $LATEST_VERSION"
 ARCH=$(uname -m)
-case $ARCH in
-    x86_64|i386|i486|i586|i686)
-        echo "ARCH: $ARCH"
-        if [ -d /sys/firmware/efi ]; then
-            echo "BOOT MODE: UEFI"
+
+if [[ $LATEST_VERSION == 7.* ]]; then
+    case $ARCH in
+        x86_64|i386|i486|i586|i686)
+            echo "ARCH: $ARCH"
+            if [ -d /sys/firmware/efi ]; then
+                echo "BOOT MODE: UEFI"
+                IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION.img.zip"
+            else
+                echo "BOOT MODE: BIOS/MBR"
+                IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION-legacy-bios.img.zip"
+            fi
+            ;; 
+        aarch64)
+             echo "ARCH: $ARCH"
+             IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION-arm64/chr-$LATEST_VERSION-arm64.img.zip"
+            ;; 
+        *)
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+            ;;
+    esac
+else
+    case $ARCH in
+        x86_64|i386|i486|i586|i686)
+            echo "ARCH: $ARCH"
             IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION.img.zip"
-        else
-            echo "BOOT MODE: BIOS/MBR"
-            IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION-legacy-bios.img.zip"
-        fi
-        ;; 
-    aarch64)
-         echo "ARCH: $ARCH"
-         IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION-arm64/chr-$LATEST_VERSION-arm64.img.zip"
-        ;; 
-    *)
-        echo "Unsupported architecture: $ARCH"
-        exit 1
-        ;;
-esac
+            ;; 
+        *)
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+            ;;
+    esac
+fi
+
 STORAGE=$(lsblk -d -n -o NAME,TYPE | awk '$2=="disk"{print $1; exit}')
 echo "STORAGE: $STORAGE"
 ETH=$(ip route show default | grep '^default' | sed -n 's/.* dev \([^\ ]*\) .*/\1/p')

index.html

@@ -847,7 +847,7 @@
             function updateCommand(version) {
                 const tool = document.querySelector('input[name="tool"]:checked').value;
                 let cmd;
-                const proxy = `${localStorage.getItem("gh-proxy-enabled") === "true"?" | sed 's#https://github.com#https:/gh-proxy.com/https://github.com#g'":""}`;
+                const proxy = `${localStorage.getItem("gh-proxy-enabled") === "true"?" | sed 's#https://github.com#https://gh-proxy.com/https://github.com#g'":""}`;
                 if (tool === "curl") {
                     cmd = `<pre ${proxy === ""?"":"style='font-size:12px'"}><span class="bash">curl</span> <span class="url">https://mikrotik.ltd/chr.sh</span>${proxy} | <span class="bash">bash</span> -s <span class="version">${version}</span></pre>`;
                 } else {