yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix something

Browse Source
This commit is contained in:
Ing 2024-04-11 22:36:56 +08:00
parent afd124ce31
commit 56d2213245
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
localbuild.sh
View File

@ -32,8 +32,8 @@ function create() {
exit 1 exit 1
fi fi
sudo apt-get update sudo apt update
sudo apt-get install -y locales busybox dialog curl xz-utils cpio sed sudo apt install -y locales busybox dialog curl xz-utils cpio sed
sudo locale-gen de_DE.UTF-8 en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 vi_VN.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8 sudo locale-gen de_DE.UTF-8 en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 vi_VN.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
YQ=$(command -v yq) YQ=$(command -v yq)

5
scripts/func.py
View File

@ -34,7 +34,10 @@ def getmodels(workpath, jsonpath, xlsxpath):
M_productvers = M_data.get("productvers", []) M_productvers = M_data.get("productvers", [])
productvers = {} productvers = {}
for P in M_productvers: for P in M_productvers:
productvers[P] = M_productvers[P].get("kver", "") if M_productvers[P].get("kpre", "") != "":
productvers[P] = M_productvers[P].get("kpre", "") + "-" + M_productvers[P].get("kver", "")
else:
productvers[P] = M_productvers[P].get("kver", "")
models[M_name] = {"platform": M_platform, "productvers": productvers} models[M_name] = {"platform": M_platform, "productvers": productvers}
if jsonpath: if jsonpath:

12
sourcebuild.sh
View File

@ -78,11 +78,11 @@ sudo mount ${LOOPX}p1 "/tmp/mnt/p1" || (
exit 1 exit 1
) )
sudo mount ${LOOPX}p2 "/tmp/mnt/p2" || ( sudo mount ${LOOPX}p2 "/tmp/mnt/p2" || (
echo -e "Can't mount ${LOOPX}p1." echo -e "Can't mount ${LOOPX}p2."
exit 1 exit 1
) )
sudo mount ${LOOPX}p3 "/tmp/mnt/p3" || ( sudo mount ${LOOPX}p3 "/tmp/mnt/p3" || (
echo -e "Can't mount ${LOOPX}p1." echo -e "Can't mount ${LOOPX}p3."
exit 1 exit 1
) )
@ -92,12 +92,12 @@ sudo cp -rf "files/mnt/p1/"* "/tmp/mnt/p1" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p1."
exit 1 exit 1
) )
cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || ( sudo cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p2."
exit 1 exit 1
) )
cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || ( sudo cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p2."
exit 1 exit 1
) )