From fe1d2c65f738f0701d3dc55d9e65ccadeac3025b Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Fri, 5 May 2023 18:38:10 +0800
Subject: [PATCH] add update check

---
 .github/workflows/main.yml                    | 36 ++++----
 .../arpl/overlayfs/opt/arpl/lang/arpl.pot     | 91 ++++++++++---------
 .../arpl/overlayfs/opt/arpl/lang/zh_CN.po     | 85 +++++++++--------
 files/board/arpl/overlayfs/opt/arpl/menu.sh   | 10 ++
 update-check.sh                               |  5 +
 update-list.yml                               |  1 -
 6 files changed, 129 insertions(+), 99 deletions(-)
 create mode 100644 update-check.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95f2d636..a1020a70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -160,26 +160,18 @@ jobs:
           qemu-img convert -O vmdk arpl.img arpl-dyn.vmdk
           qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
-          zip -9 "arpl-i18n.zip" arpl.img
-
-      # Upload artifact
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: Images
-          path: |
-            arpl-i18n.zip
-          retention-days: 5
-
       # Zip image and generate checksum
       - name: Pack
-        if: env.VERSION != ''
         run: |
-          zip -9 "arpl-i18n-${{ env.VERSION }}.img.zip" arpl.img
-          zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
-          zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
-          sha256sum update-list.yml > sha256sum
-          zip -9j update.zip update-list.yml
+          if [ -n "${{ env.VERSION }}" ]; then
+            zip -9 "arpl-i18n-${{ env.VERSION }}.img.zip" arpl.img
+            zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
+            zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+          else
+            zip -9 "arpl-i18n.img.zip" arpl.img
+          fi
+          sha256sum update-list.yml update-check.sh > sha256sum
+          zip -9j update.zip update-list.yml update-check.sh
           while read F; do
             if [ -d "${F}" ]; then
               FTGZ="`basename "${F}"`.tgz"
@@ -194,6 +186,16 @@ jobs:
           done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml)
           zip -9j update.zip sha256sum 
 
+      # Upload artifact
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: Images
+          path: |
+            arpl-i18n.img.zip
+            update.zip
+          retention-days: 5
+
       # Publish a release if is a tag
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot
index 53ba2e8e..bdd63c50 100644
--- a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot
+++ b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-05 15:25+0800\n"
+"POT-Creation-Date: 2023-05-05 18:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,7 +221,7 @@ msgstr ""
 msgid "Please enter a serial number "
 msgstr ""
 
-#: menu.sh:208 menu.sh:427 menu.sh:1039 menu.sh:1306
+#: menu.sh:208 menu.sh:427 menu.sh:1039 menu.sh:1316
 msgid "Alert"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgid "Download a external addon"
 msgstr ""
 
 #: menu.sh:244 menu.sh:354 menu.sh:466 menu.sh:780 menu.sh:951 menu.sh:1098
-#: menu.sh:1355
+#: menu.sh:1365
 msgid "Exit"
 msgstr ""
 
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Addon %s not found!"
 msgstr ""
 
-#: menu.sh:747 menu.sh:1373
+#: menu.sh:747 menu.sh:1383
 msgid "Cleaning"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: menu.sh:783 menu.sh:1358
+#: menu.sh:783 menu.sh:1368
 msgid "Choose the option"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Config changed, would you like to rebuild the loader?"
 msgstr ""
 
-#: menu.sh:1052 menu.sh:1349
+#: menu.sh:1052 menu.sh:1359
 msgid "Choose a language"
 msgstr ""
 
@@ -709,22 +709,23 @@ msgid "Choice a keymap"
 msgstr ""
 
 #: menu.sh:1093 menu.sh:1103 menu.sh:1111 menu.sh:1117 menu.sh:1121
-#: menu.sh:1126 menu.sh:1132 menu.sh:1139 menu.sh:1143 menu.sh:1160
+#: menu.sh:1126 menu.sh:1132 menu.sh:1139 menu.sh:1148 menu.sh:1153
+#: menu.sh:1170
 msgid "Update arpl"
 msgstr ""
 
-#: menu.sh:1094 menu.sh:1168 menu.sh:1176 menu.sh:1182 menu.sh:1186
-#: menu.sh:1190 menu.sh:1194 menu.sh:1199 menu.sh:1210
+#: menu.sh:1094 menu.sh:1178 menu.sh:1186 menu.sh:1192 menu.sh:1196
+#: menu.sh:1200 menu.sh:1204 menu.sh:1209 menu.sh:1220
 msgid "Update addons"
 msgstr ""
 
-#: menu.sh:1095 menu.sh:1215 menu.sh:1223 menu.sh:1229 menu.sh:1233
-#: menu.sh:1237 menu.sh:1252
+#: menu.sh:1095 menu.sh:1225 menu.sh:1233 menu.sh:1239 menu.sh:1243
+#: menu.sh:1247 menu.sh:1262
 msgid "Update modules"
 msgstr ""
 
-#: menu.sh:1096 menu.sh:1257 menu.sh:1265 menu.sh:1271 menu.sh:1275
-#: menu.sh:1279 menu.sh:1283 menu.sh:1288
+#: menu.sh:1096 menu.sh:1267 menu.sh:1275 menu.sh:1281 menu.sh:1285
+#: menu.sh:1289 menu.sh:1293 menu.sh:1298
 msgid "Update LKMs"
 msgstr ""
 
@@ -732,15 +733,15 @@ msgstr ""
 msgid "Set proxy server"
 msgstr ""
 
-#: menu.sh:1104 menu.sh:1169 menu.sh:1216 menu.sh:1258
+#: menu.sh:1104 menu.sh:1179 menu.sh:1226 menu.sh:1268
 msgid "Checking last version"
 msgstr ""
 
-#: menu.sh:1112 menu.sh:1177 menu.sh:1224 menu.sh:1266
+#: menu.sh:1112 menu.sh:1187 menu.sh:1234 menu.sh:1276
 msgid "Error checking new version"
 msgstr ""
 
-#: menu.sh:1118 menu.sh:1183 menu.sh:1230 menu.sh:1272
+#: menu.sh:1118 menu.sh:1193 menu.sh:1240 menu.sh:1282
 msgid "No new version. Actual version is %s\\nForce update?"
 msgstr ""
 
@@ -760,106 +761,112 @@ msgstr ""
 msgid "Checksum do not match!"
 msgstr ""
 
-#: menu.sh:1144
+#: menu.sh:1149
+msgid ""
+"The current version does not support upgrading to the latest update.zip. "
+"Please remake the bootloader disk!"
+msgstr ""
+
+#: menu.sh:1154
 msgid "Installing new files"
 msgstr ""
 
-#: menu.sh:1161
+#: menu.sh:1171
 msgid "Arpl updated with success to %s!\\nReboot?"
 msgstr ""
 
-#: menu.sh:1187 menu.sh:1234 menu.sh:1276
+#: menu.sh:1197 menu.sh:1244 menu.sh:1286
 msgid "Downloading last version"
 msgstr ""
 
-#: menu.sh:1191
+#: menu.sh:1201
 msgid "Error downloading new version"
 msgstr ""
 
-#: menu.sh:1195 menu.sh:1284
+#: menu.sh:1205 menu.sh:1294
 msgid "Extracting last version"
 msgstr ""
 
-#: menu.sh:1200
+#: menu.sh:1210
 msgid "Installing new addons"
 msgstr ""
 
-#: menu.sh:1211
+#: menu.sh:1221
 msgid "Addons updated with success!"
 msgstr ""
 
-#: menu.sh:1238 menu.sh:1280
+#: menu.sh:1248 menu.sh:1290
 msgid "Error downloading last version"
 msgstr ""
 
-#: menu.sh:1253
+#: menu.sh:1263
 msgid "Modules updated with success!"
 msgstr ""
 
-#: menu.sh:1289
+#: menu.sh:1299
 msgid "LKMs updated with success!"
 msgstr ""
 
-#: menu.sh:1295
+#: menu.sh:1305
 msgid "Set Proxy Server"
 msgstr ""
 
-#: menu.sh:1296
+#: menu.sh:1306
 msgid "Please enter a proxy server url"
 msgstr ""
 
-#: menu.sh:1307
+#: menu.sh:1317
 msgid "Invalid proxy server url, continue?"
 msgstr ""
 
-#: menu.sh:1330
+#: menu.sh:1340
 msgid "Choose a model"
 msgstr ""
 
-#: menu.sh:1332
+#: menu.sh:1342
 msgid "Choose a Build Number"
 msgstr ""
 
-#: menu.sh:1333
+#: menu.sh:1343
 msgid "Choose a serial number"
 msgstr ""
 
-#: menu.sh:1335
+#: menu.sh:1345
 msgid "Addons"
 msgstr ""
 
-#: menu.sh:1336
+#: menu.sh:1346
 msgid "Cmdline menu"
 msgstr ""
 
-#: menu.sh:1337
+#: menu.sh:1347
 msgid "Synoinfo menu"
 msgstr ""
 
-#: menu.sh:1340
+#: menu.sh:1350
 msgid "Advanced menu"
 msgstr ""
 
-#: menu.sh:1343
+#: menu.sh:1353
 msgid "Build the loader"
 msgstr ""
 
-#: menu.sh:1347
+#: menu.sh:1357
 msgid "Boot the loader"
 msgstr ""
 
-#: menu.sh:1350
+#: menu.sh:1360
 msgid "Choose a keymap"
 msgstr ""
 
-#: menu.sh:1352
+#: menu.sh:1362
 msgid "Clean disk cache"
 msgstr ""
 
-#: menu.sh:1354
+#: menu.sh:1364
 msgid "Update menu"
 msgstr ""
 
-#: menu.sh:1380
+#: menu.sh:1390
 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu"
 msgstr ""
diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po
index caac6e4d..56ce6c37 100644
--- a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po
+++ b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: arpl-i18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-05 15:25+0800\n"
-"PO-Revision-Date: 2023-05-05 15:26+0800\n"
+"POT-Creation-Date: 2023-05-05 18:32+0800\n"
+"PO-Revision-Date: 2023-05-05 18:32+0800\n"
 "Last-Translator: ing <wjz304@qq.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -695,7 +695,7 @@ msgstr "无效的YAML格式"
 msgid "Config changed, would you like to rebuild the loader?"
 msgstr "配置已更改, 是否重新编译引导?"
 
-#: menu.sh:1052 menu.sh:1349
+#: menu.sh:1052 menu.sh:1359
 msgid "Choose a language"
 msgstr "选择语言"
 
@@ -708,22 +708,23 @@ msgid "Choice a keymap"
 msgstr "选择键盘"
 
 #: menu.sh:1093 menu.sh:1103 menu.sh:1111 menu.sh:1117 menu.sh:1121
-#: menu.sh:1126 menu.sh:1132 menu.sh:1139 menu.sh:1143 menu.sh:1160
+#: menu.sh:1126 menu.sh:1132 menu.sh:1139 menu.sh:1148 menu.sh:1153
+#: menu.sh:1170
 msgid "Update arpl"
 msgstr "更新arpl"
 
-#: menu.sh:1094 menu.sh:1168 menu.sh:1176 menu.sh:1182 menu.sh:1186
-#: menu.sh:1190 menu.sh:1194 menu.sh:1199 menu.sh:1210
+#: menu.sh:1094 menu.sh:1178 menu.sh:1186 menu.sh:1192 menu.sh:1196
+#: menu.sh:1200 menu.sh:1204 menu.sh:1209 menu.sh:1220
 msgid "Update addons"
 msgstr "更新插件"
 
-#: menu.sh:1095 menu.sh:1215 menu.sh:1223 menu.sh:1229 menu.sh:1233
-#: menu.sh:1237 menu.sh:1252
+#: menu.sh:1095 menu.sh:1225 menu.sh:1233 menu.sh:1239 menu.sh:1243
+#: menu.sh:1247 menu.sh:1262
 msgid "Update modules"
 msgstr "更新模块"
 
-#: menu.sh:1096 menu.sh:1257 menu.sh:1265 menu.sh:1271 menu.sh:1275
-#: menu.sh:1279 menu.sh:1283 menu.sh:1288
+#: menu.sh:1096 menu.sh:1267 menu.sh:1275 menu.sh:1281 menu.sh:1285
+#: menu.sh:1289 menu.sh:1293 menu.sh:1298
 msgid "Update LKMs"
 msgstr "更新LKMs"
 
@@ -731,15 +732,15 @@ msgstr "更新LKMs"
 msgid "Set proxy server"
 msgstr "设置代理"
 
-#: menu.sh:1104 menu.sh:1169 menu.sh:1216 menu.sh:1258
+#: menu.sh:1104 menu.sh:1179 menu.sh:1226 menu.sh:1268
 msgid "Checking last version"
 msgstr "检测新版本中"
 
-#: menu.sh:1112 menu.sh:1177 menu.sh:1224 menu.sh:1266
+#: menu.sh:1112 menu.sh:1187 menu.sh:1234 menu.sh:1276
 msgid "Error checking new version"
 msgstr "检测新版本错误"
 
-#: menu.sh:1118 menu.sh:1183 menu.sh:1230 menu.sh:1272
+#: menu.sh:1118 menu.sh:1193 menu.sh:1240 menu.sh:1282
 msgid "No new version. Actual version is %s\\nForce update?"
 msgstr "没有新版本. 实际版本为 %s\\n强制更新?"
 
@@ -759,106 +760,112 @@ msgstr "更新文件解压错误"
 msgid "Checksum do not match!"
 msgstr "Checksum不匹配!"
 
-#: menu.sh:1144
+#: menu.sh:1149
+msgid ""
+"The current version does not support upgrading to the latest update.zip. "
+"Please remake the bootloader disk!"
+msgstr "当前版本不支持最新的update.zip升级, 请重新制作引导盘!"
+
+#: menu.sh:1154
 msgid "Installing new files"
 msgstr "安装更新中"
 
-#: menu.sh:1161
+#: menu.sh:1171
 msgid "Arpl updated with success to %s!\\nReboot?"
 msgstr "Arpl更新成功 %s!\\n重启?"
 
-#: menu.sh:1187 menu.sh:1234 menu.sh:1276
+#: menu.sh:1197 menu.sh:1244 menu.sh:1286
 msgid "Downloading last version"
 msgstr "下载新版本中"
 
-#: menu.sh:1191
+#: menu.sh:1201
 msgid "Error downloading new version"
 msgstr "下载新版本错误"
 
-#: menu.sh:1195 menu.sh:1284
+#: menu.sh:1205 menu.sh:1294
 msgid "Extracting last version"
 msgstr "解压新版本"
 
-#: menu.sh:1200
+#: menu.sh:1210
 msgid "Installing new addons"
 msgstr "安装新插件中"
 
-#: menu.sh:1211
+#: menu.sh:1221
 msgid "Addons updated with success!"
 msgstr "插件更新成功!"
 
-#: menu.sh:1238 menu.sh:1280
+#: menu.sh:1248 menu.sh:1290
 msgid "Error downloading last version"
 msgstr "下载新版本错误"
 
-#: menu.sh:1253
+#: menu.sh:1263
 msgid "Modules updated with success!"
 msgstr "模块更新成功!"
 
-#: menu.sh:1289
+#: menu.sh:1299
 msgid "LKMs updated with success!"
 msgstr "LKMs更新成功!"
 
-#: menu.sh:1295
+#: menu.sh:1305
 msgid "Set Proxy Server"
 msgstr "设置代理"
 
-#: menu.sh:1296
+#: menu.sh:1306
 msgid "Please enter a proxy server url"
 msgstr "请输入代理服务器url"
 
-#: menu.sh:1307
+#: menu.sh:1317
 msgid "Invalid proxy server url, continue?"
 msgstr "无效的代理服务器url,是否继续?"
 
-#: menu.sh:1330
+#: menu.sh:1340
 msgid "Choose a model"
 msgstr "选择型号"
 
-#: menu.sh:1332
+#: menu.sh:1342
 msgid "Choose a Build Number"
 msgstr "选择版本"
 
-#: menu.sh:1333
+#: menu.sh:1343
 msgid "Choose a serial number"
 msgstr "选择SN"
 
-#: menu.sh:1335
+#: menu.sh:1345
 msgid "Addons"
 msgstr "插件"
 
-#: menu.sh:1336
+#: menu.sh:1346
 msgid "Cmdline menu"
 msgstr "设置Cmdline"
 
-#: menu.sh:1337
+#: menu.sh:1347
 msgid "Synoinfo menu"
 msgstr "设置Synoinfo"
 
-#: menu.sh:1340
+#: menu.sh:1350
 msgid "Advanced menu"
 msgstr "高级设置"
 
-#: menu.sh:1343
+#: menu.sh:1353
 msgid "Build the loader"
 msgstr "编译引导"
 
-#: menu.sh:1347
+#: menu.sh:1357
 msgid "Boot the loader"
 msgstr "启动"
 
-#: menu.sh:1350
+#: menu.sh:1360
 msgid "Choose a keymap"
 msgstr "选择键盘"
 
-#: menu.sh:1352
+#: menu.sh:1362
 msgid "Clean disk cache"
 msgstr "清除磁盘缓存"
 
-#: menu.sh:1354
+#: menu.sh:1364
 msgid "Update menu"
 msgstr "更新"
 
-#: menu.sh:1380
+#: menu.sh:1390
 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu"
 msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单"
diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
index 596aaa18..4538f700 100755
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -1140,6 +1140,16 @@ function updateMenu() {
             --msgbox "$(TEXT "Checksum do not match!")" 0 0
           continue
         fi
+        # Check conditions
+        if [ -f "/tmp/update-check.sh" ]; then
+          chmod +x /tmp/update-check.sh
+          /tmp/update-check.sh
+          if [ $? -ne 0 ]; then
+            dialog --backtitle "`backtitle`" --title "$(TEXT "Update arpl")" --aspect 18 \
+              --msgbox "$(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" 0 0
+            continue
+          fi
+        fi
         dialog --backtitle "`backtitle`" --title "$(TEXT "Update arpl")" --aspect 18 \
           --infobox "$(TEXT "Installing new files")" 0 0
         # Process update-list.yml
diff --git a/update-check.sh b/update-check.sh
new file mode 100644
index 00000000..cdde1efb
--- /dev/null
+++ b/update-check.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+[ ! -f /mnt/p1/boot/grub/grub.cfg ] && exit 1
+
+exit 0
\ No newline at end of file
diff --git a/update-list.yml b/update-list.yml
index 9888f98e..983d955a 100644
--- a/update-list.yml
+++ b/update-list.yml
@@ -1,5 +1,4 @@
 remove:
-  "files/board/arpl/p1/grub/"
 replace:
   ".buildroot/output/images/bzImage": "/mnt/p3/bzImage-arpl"
   ".buildroot/output/images/rootfs.cpio.xz": "/mnt/p3/initrd-arpl"