From bfa5266af8d450644e45201701ba7b83193870c2 Mon Sep 17 00:00:00 2001
From: zyb <elseif@live.cn>
Date: Mon, 1 Jul 2024 22:42:31 +0800
Subject: [PATCH] 	modified:   .github/workflows/mikrotik_patch.yml 
 modified:   .gitignore 	modified:   patch.py

---
 .github/workflows/mikrotik_patch.yml |  9 +++++----
 .gitignore                           |  1 +
 patch.py                             | 11 +++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml
index 8cefae5..6d6ad0f 100644
--- a/.github/workflows/mikrotik_patch.yml
+++ b/.github/workflows/mikrotik_patch.yml
@@ -270,11 +270,12 @@ jobs:
 
     - name: Upload Files
       run: |
-        mkdir ./publish
-        cp CHANGELOG.txt ./publish/
-        cp ./new_iso/*.npk ./publish/
+        mkdir -p ./publish/$LATEST_VERSION
+        cp CHANGELOG.txt ./publish/$LATEST_VERSION/CHANGELOG
+        cp ./new_iso/*.npk ./publish/$LATEST_VERSION/
+        echo $LATEST_VERSION $(date +"%s") > ./publish/NEWESTa7.${{ matrix.channel }}
         sudo apt-get install -y lftp
-        sudo -E lftp -u ${{ secrets.SSH_USERNAME }},'${{ secrets.SSH_PASSWORD }}' sftp://${{ secrets.SSH_SERVER }}:${{ secrets.SSH_PORT }} <<'EOF'
+        sudo -E lftp -u ${{ secrets.SSH_USERNAME }},'${{ secrets.SSH_PASSWORD }}' sftp://${{ secrets.SSH_SERVER }}:${{ secrets.SSH_PORT }} <<EOF
           set sftp:auto-confirm yes
           mirror --reverse --verbose ./publish ${{ secrets.SSH_DIRECTORY }}/${{ env.LATEST_VERSION }}
           bye
diff --git a/.gitignore b/.gitignore
index 0c1dec5..228f8b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 __pycache__/
 venv/
 keygen/
+app/
 test_*.py
 mikrotik*
\ No newline at end of file
diff --git a/patch.py b/patch.py
index 4efe10a..f0b8360 100644
--- a/patch.py
+++ b/patch.py
@@ -60,6 +60,17 @@ def patch_squashfs(path,key_dict):
                         print(f'{file} public key patched {old_public_key[:16].hex().upper()}...')
                         data = data.replace(old_public_key,new_public_key)
                         open(file,'wb').write(data)
+                data = open(file,'rb').read()
+                url_dict = {
+                    os.environ['MIKRO_LICENSE_URL'].encode():os.environ['CUSTOM_LICENSE_URL'].encode(),
+                    os.environ['MIKRO_UPGRADE_URL'].encode():os.environ['CUSTOM_UPGRADE_URL'].encode()
+                }
+                for old_url,new_url in url_dict.items():
+                    if old_url in data:
+                        print(f'{file} url patched {old_url.decode()[:7]}...')
+                        data = data.replace(old_url,new_url)
+                        open(file,'wb').write(data)
+
 
 def patch_npk_file(key_dict,kcdsa_private_key,eddsa_private_key,input_file,output_file=None):
     npk = NovaPackage.load(input_file)