xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加开关 Load_Common_Config

This commit is contained in:
Hyy2001X 2021-08-14 11:35:40 +08:00
parent cb357bf502
commit b3a72ad376
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Scripts/AutoBuild_DiyScript.sh
View File

@ -8,6 +8,7 @@ Diy_Core() {
Banner_Title="Powered by AutoBuild-Actions" Banner_Title="Powered by AutoBuild-Actions"
Default_LAN_IP=192.168.1.1 Default_LAN_IP=192.168.1.1
Load_Common_Config=true
Load_CustomPackages_List=true Load_CustomPackages_List=true
Short_Firmware_Date=true Short_Firmware_Date=true
Checkout_Virtual_Images=false Checkout_Virtual_Images=false

12
Scripts/AutoBuild_Function.sh
View File

@ -82,6 +82,7 @@ OP_REPO_NAME=${OP_REPO_NAME}
EOF EOF
cat >> ${Home}/VARIABLE_FILE <<EOF cat >> ${Home}/VARIABLE_FILE <<EOF
Home=${Home} Home=${Home}
Load_Common_Config=${Load_Common_Config}
PKG_Compatible="${INCLUDE_Obsolete_PKG_Compatible}" PKG_Compatible="${INCLUDE_Obsolete_PKG_Compatible}"
Checkout_Virtual_Images="${Checkout_Virtual_Images}" Checkout_Virtual_Images="${Checkout_Virtual_Images}"
Firmware_Path=${Home}/bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET} Firmware_Path=${Home}/bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}
@ -248,13 +249,12 @@ Firmware-Diy_Other() {
ECHO "[${OP_Maintainer}]: Current Source_Maintainer is not supported ..." ECHO "[${OP_Maintainer}]: Current Source_Maintainer is not supported ..."
fi fi
fi fi
if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then if [[ ${Load_Common_Config} == true ]];then
[[ ! "$(cat .config)" =~ "## TEST" ]] && { if [[ -s $GITHUB_WORKSPACE/Configs/Common || ! "$(cat .config)" =~ "## TEST" ]];then
ECHO "Merging [Configs/Common] to .config ..." ECHO "Merging [Configs/Common] to .config ..."
echo -e "\n$(cat $GITHUB_WORKSPACE/Configs/Common)" >> .config echo -e "\n$(cat $GITHUB_WORKSPACE/Configs/Common)" >> .config
} || { fi
sed -i '/## TEST/d' .config >/dev/null 2>&1 sed -i '/## TEST/d' .config >/dev/null 2>&1
}
fi fi
ECHO "[Firmware-Diy_Other] Done." ECHO "[Firmware-Diy_Other] Done."
} }
@ -279,7 +279,7 @@ Firmware-Diy_End() {
Process_Firmware ${Firmware_Format} Process_Firmware ${Firmware_Format}
;; ;;
esac esac
[[ $(ls) =~ 'AutoBuild-' ]] && mv -f AutoBuild-* ${Home}/bin/Firmware [[ $(ls) =~ 'AutoBuild-' ]] && cp -a AutoBuild-* ${Home}/bin/Firmware
cd - cd -
echo "[$(date "+%H:%M:%S")] Actions Avaliable: $(df -h | grep "/dev/root" | awk '{printf $4}')" echo "[$(date "+%H:%M:%S")] Actions Avaliable: $(df -h | grep "/dev/root" | awk '{printf $4}')"
ECHO "[Firmware-Diy_End] Done." ECHO "[Firmware-Diy_End] Done."