From 8cb284f49babf53cfd8feccea393a707cdd9cdd6 Mon Sep 17 00:00:00 2001 From: Ing Date: Sun, 31 Mar 2024 02:28:37 +0800 Subject: [PATCH] add language of localbuild --- .github/workflows/issues.yml | 9 +++++++-- docs/issues.html | 19 ++++++++++++++++++- files/initrd/opt/rr/ramdisk-patch.sh | 1 - localbuild.sh | 15 ++++++++++++--- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index fe71d0f5..12bcf643 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -37,11 +37,13 @@ jobs: iscustom = 'false' warinfo = 'false' model = '' + language= '' try: if issuetitle.lower().startswith('custom'): - json_object = json.loads(issuebody) + jsonbody = json.loads(issuebody) iscustom = 'true' - model = json_object.get('model', '') + model = jsonbody.get('model', '') + language = jsonbody.get('language', '') except ValueError as e: pass @@ -52,6 +54,7 @@ jobs: set_output("iscustom", iscustom) set_output("warinfo", warinfo) set_output("model", model) + set_output("language", language) - name: Update Comment Warinfo if: env.warinfo == 'true' @@ -155,6 +158,8 @@ jobs: # sudo cp -rf files/initrd/opt/rr/* rr/ws/initrd/opt/rr/ # sudo sed -i "s/set -e/set -ex/" rr/ws/initrd/opt/rr/init.sh # sudo sed -i '/^alias/i\set -x' rr/ws/initrd/opt/rr/menu.sh + + [ -n "${{ env.language }}" ] && echo "${{ env.language }}.UTF-8" > rr/ws/mnt/p1/.locale sudo ./localbuild.sh config ${MODEL} if [ $? -ne 0 ]; then diff --git a/docs/issues.html b/docs/issues.html index 7728cfec..5c0da990 100644 --- a/docs/issues.html +++ b/docs/issues.html @@ -58,7 +58,7 @@ let formData = new FormData(form); var title = "custom"; var body = {}; - var _parameters = ["title", "model"]; + var _parameters = ["title", "language", "model"]; for (var key in _parameters) { var name = _parameters[key]; if (name == "title") { @@ -135,6 +135,23 @@ value="" /> +
+
+ +
+
+ +
+
diff --git a/files/initrd/opt/rr/ramdisk-patch.sh b/files/initrd/opt/rr/ramdisk-patch.sh index 58beda50..76a5da8d 100755 --- a/files/initrd/opt/rr/ramdisk-patch.sh +++ b/files/initrd/opt/rr/ramdisk-patch.sh @@ -167,7 +167,6 @@ echo "export LAYOUT=${LAYOUT}" >>"${RAMDISK_PATH}/addons/addons.sh" echo "export KEYMAP=${KEYMAP}" >>"${RAMDISK_PATH}/addons/addons.sh" chmod +x "${RAMDISK_PATH}/addons/addons.sh" -# Required addons: "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "rndis" # This order cannot be changed. for ADDON in "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "rndis"; do PARAMS="" diff --git a/localbuild.sh b/localbuild.sh index e47ed188..b053fb8b 100755 --- a/localbuild.sh +++ b/localbuild.sh @@ -168,9 +168,18 @@ function pack() { echo "Pack image file" cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null - cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" - cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/mnt/p2" - cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/mnt/p3" + cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" || ( + echo -e "Can't cp ${LOOPX}p1." + exit 1 + ) + cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/mnt/p2" || ( + echo -e "Can't cp ${LOOPX}p1." + exit 1 + ) + cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/mnt/p3" || ( + echo -e "Can't cp ${LOOPX}p1." + exit 1 + ) sudo sync sudo umount "/tmp/mnt/p1" sudo umount "/tmp/mnt/p2"