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

添加 '## DO NOT MERGE' 控制

This commit is contained in:
Hyy2001X 2021-06-21 10:28:27 +08:00
parent eef007d48b
commit 96d6234047
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Scripts/AutoBuild_Function.sh
View File

@ -262,7 +262,7 @@ Other_Scripts() {
19.07 | 21.02) 19.07 | 21.02)
Copy CustomFiles/Patches/0003-upx-ucl-${Openwrt_Branch}.patch ./ Copy CustomFiles/Patches/0003-upx-ucl-${Openwrt_Branch}.patch ./
cat 0003-upx-ucl-${Openwrt_Branch}.patch | patch -p1 > /dev/null 2>&1 cat 0003-upx-ucl-${Openwrt_Branch}.patch | patch -p1 > /dev/null 2>&1
# AddPackage svn feeds/packages/lang golang coolsnowwolf/packages/trunk/lang # AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang
TIME "Start to convert zh-cn translation files to zh_Hans ..." TIME "Start to convert zh-cn translation files to zh_Hans ..."
Copy Scripts/Convert_Translation.sh package Copy Scripts/Convert_Translation.sh package
cd ./package && bash ./Convert_Translation.sh && cd .. cd ./package && bash ./Convert_Translation.sh && cd ..
@ -275,10 +275,15 @@ Other_Scripts() {
TIME "Current source: [${Openwrt_Author}] is not supported,skip..." TIME "Current source: [${Openwrt_Author}] is not supported,skip..."
fi fi
fi fi
[[ -s $GITHUB_WORKSPACE/Configs/Common ]] && { if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then
TIME "Merging Common_Config to .config ..." [[ ! "$(cat .config)" =~ "## DO NOT MERGE" ]] && {
cat $GITHUB_WORKSPACE/Configs/Common >> .config TIME "Merging [Configs/Common] to .config ..."
} cat $GITHUB_WORKSPACE/Configs/Common >> .config
} || {
TIME "Skip merge [Configs/Common] ..."
sed -i '/## DO NOT MERGE/d' .config >/dev/null 2>&1
}
fi
} }
PS_Firmware() { PS_Firmware() {
@ -303,11 +308,11 @@ PS_Firmware() {
TIME "Firmware: [${Default_Firmware}] is detected !" TIME "Firmware: [${Default_Firmware}] is detected !"
} || { } || {
TIME "Firmware is not detected !" TIME "Firmware is not detected !"
Output=1 Error_Output=1
} }
;; ;;
esac esac
[[ ${Output} != 1 ]] && mv -f AutoBuild-* ${Home}/bin/Firmware [[ ${Error_Output} != 1 ]] && mv -f AutoBuild-* ${Home}/bin/Firmware
cd ${Home} cd ${Home}
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}')"
} }
@ -412,7 +417,7 @@ Copy() {
TIME "[ERROR] Error options: [$#] [$*] !" TIME "[ERROR] Error options: [$#] [$*] !"
return 0 return 0
} }
[ ! -f "${GITHUB_WORKSPACE}/$1" ] && [ ! -d "${GITHUB_WORKSPACE}/$1" ] && { [[ ! -f ${GITHUB_WORKSPACE}/$1 ]] && [[ ! -d ${GITHUB_WORKSPACE}/$1 ]] && {
TIME "CustomFiles/${FILE_NAME} is not detected !" TIME "CustomFiles/${FILE_NAME} is not detected !"
return 0 return 0
} }