mirror of
https://github.com/RROrg/rr.git
synced 2025-12-08 21:19:43 +08:00
更新构建脚本,移除对 menu.sh 的依赖,直接调用相关函数
This commit is contained in:
parent
569c2506e0
commit
06823ae881
23
.github/workflows/issues.yml
vendored
23
.github/workflows/issues.yml
vendored
@ -193,13 +193,14 @@ jobs:
|
|||||||
|
|
||||||
echo "Building..."
|
echo "Building..."
|
||||||
{
|
{
|
||||||
|
echo ". include/functions.sh"
|
||||||
[ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
|
[ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
|
||||||
[ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
|
[ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
|
||||||
[ -n "${{ env.kernel }}" ] && echo "menu.sh writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
|
[ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
|
||||||
echo "menu.sh modelMenu \"${{ env.model }}\""
|
echo "menu.sh modelMenu \"${{ env.model }}\""
|
||||||
echo "menu.sh productversMenu \"${{ env.version }}\""
|
echo "menu.sh productversMenu \"${{ env.version }}\""
|
||||||
[ -n "${{ env.addons }}" ] && {
|
[ -n "${{ env.addons }}" ] && {
|
||||||
echo "menu.sh writeConfigKey \"addons\" \"{}\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"addons\" \"{}\" \"\${USER_CONFIG_FILE}\""
|
||||||
IFS=',' read -ra ADDON_ARR <<< "${{ env.addons }}"
|
IFS=',' read -ra ADDON_ARR <<< "${{ env.addons }}"
|
||||||
for A in "${ADDON_ARR[@]}"; do
|
for A in "${ADDON_ARR[@]}"; do
|
||||||
if echo "${A}" | grep -qE '^[^:]+:[^:]+$'; then
|
if echo "${A}" | grep -qE '^[^:]+:[^:]+$'; then
|
||||||
@ -209,25 +210,25 @@ jobs:
|
|||||||
KEY="${A}"
|
KEY="${A}"
|
||||||
VAL=""
|
VAL=""
|
||||||
fi
|
fi
|
||||||
echo "menu.sh writeConfigKey \"addons.\\\"${KEY}\\\"\" \"${VAL}\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"addons.\\\"${KEY}\\\"\" \"${VAL}\" \"\${USER_CONFIG_FILE}\""
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
[ ! "custom" = "${{ env.kernel }}" ] && [ -n "${{ env.modules }}" ] && {
|
[ ! "custom" = "${{ env.kernel }}" ] && [ -n "${{ env.modules }}" ] && {
|
||||||
echo "menu.sh writeConfigKey \"modules\" \"{}\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"modules\" \"{}\" \"\${USER_CONFIG_FILE}\""
|
||||||
echo "menu.sh mergeConfigModules \"$(echo "${{ env.modules }}" | sed 's/,/\\n/g')\" \"\${USER_CONFIG_FILE}\""
|
echo "mergeConfigModules \"$(echo "${{ env.modules }}" | tr ',' '\n')\" \"\${USER_CONFIG_FILE}\""
|
||||||
}
|
}
|
||||||
echo "menu.sh make"
|
echo "menu.sh make"
|
||||||
echo "menu.sh cleanCache"
|
echo "menu.sh cleanCache"
|
||||||
[ -n "${{ env.sn }}" ] && echo "menu.sh writeConfigKey \"sn\" \"${{ env.sn }}\" \"\${USER_CONFIG_FILE}\""
|
[ -n "${{ env.sn }}" ] && echo "writeConfigKey \"sn\" \"${{ env.sn }}\" \"\${USER_CONFIG_FILE}\""
|
||||||
[ -n "${{ env.macs }}" ] && {
|
[ -n "${{ env.macs }}" ] && {
|
||||||
MACS=($(echo "${{ env.macs }}" | sed 's/[:-]//g' | sed 's/.*/\U&/' | sed 's/[;,]/ /g'))
|
MACS=($(echo "${{ env.macs }}" | sed 's/[:-]//g' | sed 's/.*/\U&/' | sed 's/[;,]/ /g'))
|
||||||
[ -n "${MACS[0]}" ] && echo "menu.sh writeConfigKey \"mac1\" \"${MACS[0]}\" \"\${USER_CONFIG_FILE}\""
|
[ -n "${MACS[0]}" ] && echo "writeConfigKey \"mac1\" \"${MACS[0]}\" \"\${USER_CONFIG_FILE}\""
|
||||||
[ -n "${MACS[1]}" ] && echo "menu.sh writeConfigKey \"mac2\" \"${MACS[1]}\" \"\${USER_CONFIG_FILE}\""
|
[ -n "${MACS[1]}" ] && echo "writeConfigKey \"mac2\" \"${MACS[1]}\" \"\${USER_CONFIG_FILE}\""
|
||||||
}
|
}
|
||||||
[ "true" = "${{ env.template }}" ] && {
|
[ "true" = "${{ env.template }}" ] && {
|
||||||
echo "menu.sh writeConfigKey \"sn\" \"\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"sn\" \"\" \"\${USER_CONFIG_FILE}\""
|
||||||
echo "menu.sh writeConfigKey \"mac1\" \"\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"mac1\" \"\" \"\${USER_CONFIG_FILE}\""
|
||||||
echo "menu.sh writeConfigKey \"mac2\" \"\" \"\${USER_CONFIG_FILE}\""
|
echo "writeConfigKey \"mac2\" \"\" \"\${USER_CONFIG_FILE}\""
|
||||||
}
|
}
|
||||||
} > build.sh
|
} > build.sh
|
||||||
chmod +x build.sh
|
chmod +x build.sh
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user