mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
add language of localbuild
This commit is contained in:
parent
208e8a791b
commit
8cb284f49b
9
.github/workflows/issues.yml
vendored
9
.github/workflows/issues.yml
vendored
@ -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
|
||||
|
@ -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="" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group mt-1 mb-2 ">
|
||||
<div class="form-group-header">
|
||||
<label class="color-fg-default text-mono f6" for="model">Language:</label>
|
||||
</div>
|
||||
<div class="form-group-body">
|
||||
<select class="form-select form-control select-sm input-contrast" id="language" name="inputs[language]"
|
||||
value="">
|
||||
<option selected="selected" value="en_US">en_US</option>
|
||||
<option value="ja_JP">ja_JP</option>
|
||||
<option value="ko_KR">ko_KR</option>
|
||||
<option value="ru_RU">ru_RU</option>
|
||||
<option value="zh_CN">zh_CN</option>
|
||||
<option value="zh_HK">zh_HK</option>
|
||||
<option value="zh_TW">zh_TW</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group mt-1 mb-2 ">
|
||||
<div class="form-group-header">
|
||||
<label class="color-fg-default text-mono f6" for="model">Model:</label>
|
||||
|
@ -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=""
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user