From dd4d27fb03d505b7c554449c4a8f06e8bff0eb46 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Fri, 25 Jun 2021 00:08:51 +0800 Subject: [PATCH] Fixes --- Scripts/AutoBuild_Function.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index 32301ff..dc106cc 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -161,7 +161,7 @@ Firmware-Diy_Base() { mkdir -p package/base-files/files/etc/AutoBuild [ -f VARIABLE_FILE_Main ] && cp VARIABLE_FILE_Main package/base-files/files/etc/AutoBuild/Default_Variable Copy CustomFiles/Depends/Custom_Variable package/base-files/files/etc/AutoBuild - [[ ! "$(cat .config)" =~ "## DO NOT MERGE" ]] && AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/Common + [[ ! "$(cat ${GITHUB_WORKSPACE}/Configs/${TARGET_PROFILE})" =~ "## DO NOT MERGE" ]] && AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/Common AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/${TARGET_PROFILE} chmod +x -R ${GITHUB_WORKSPACE}/Scripts chmod 777 -R ${GITHUB_WORKSPACE}/CustomFiles @@ -430,7 +430,7 @@ Copy() { return 0 } [[ ! -f ${GITHUB_WORKSPACE}/$1 ]] && [[ ! -d ${GITHUB_WORKSPACE}/$1 ]] && { - TIME "CustomFiles/${FILE_NAME} is not detected !" + TIME "CustomFiles/$1 is not detected !" return 0 } [[ ! -d ${GITHUB_WORKSPACE}/openwrt/$2 ]] && mkdir -p ${GITHUB_WORKSPACE}/openwrt/$2