modified: .github/workflows/mikrotik_patch.yml

modified:   .gitignore
	modified:   patch.py
This commit is contained in:
zyb 2024-07-01 22:42:31 +08:00
parent 15407bbcbe
commit bfa5266af8
3 changed files with 17 additions and 4 deletions

View File

@ -270,11 +270,12 @@ jobs:
- name: Upload Files - name: Upload Files
run: | run: |
mkdir ./publish mkdir -p ./publish/$LATEST_VERSION
cp CHANGELOG.txt ./publish/ cp CHANGELOG.txt ./publish/$LATEST_VERSION/CHANGELOG
cp ./new_iso/*.npk ./publish/ cp ./new_iso/*.npk ./publish/$LATEST_VERSION/
echo $LATEST_VERSION $(date +"%s") > ./publish/NEWESTa7.${{ matrix.channel }}
sudo apt-get install -y lftp 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 set sftp:auto-confirm yes
mirror --reverse --verbose ./publish ${{ secrets.SSH_DIRECTORY }}/${{ env.LATEST_VERSION }} mirror --reverse --verbose ./publish ${{ secrets.SSH_DIRECTORY }}/${{ env.LATEST_VERSION }}
bye bye

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
__pycache__/ __pycache__/
venv/ venv/
keygen/ keygen/
app/
test_*.py test_*.py
mikrotik* mikrotik*

View File

@ -60,6 +60,17 @@ def patch_squashfs(path,key_dict):
print(f'{file} public key patched {old_public_key[:16].hex().upper()}...') print(f'{file} public key patched {old_public_key[:16].hex().upper()}...')
data = data.replace(old_public_key,new_public_key) data = data.replace(old_public_key,new_public_key)
open(file,'wb').write(data) 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): def patch_npk_file(key_dict,kcdsa_private_key,eddsa_private_key,input_file,output_file=None):
npk = NovaPackage.load(input_file) npk = NovaPackage.load(input_file)