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

优化代码

This commit is contained in:
Hyy2001X 2022-08-31 22:18:39 +08:00
parent b06a4464f1
commit 5295023cc3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Scripts/AutoBuild_Function.sh
View File

@ -8,17 +8,17 @@ Firmware_Diy_Before() {
CONFIG_TEMP="${GITHUB_WORKSPACE}/openwrt/.config" CONFIG_TEMP="${GITHUB_WORKSPACE}/openwrt/.config"
CD ${WORK} CD ${WORK}
Firmware_Diy_Core Firmware_Diy_Core
[[ ${Short_Fw_Date} == true ]] && Compile_Date="$(echo ${Compile_Date} | cut -c1-8)" [[ ${Short_Fw_Date} == true ]] && Compile_Date="$(cut -c1-8 <<< ${Compile_Date})"
Github="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100 | sed 's/^[ \t]*//g')" Github="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100 | sed 's/^[ \t]*//g')"
[[ -z ${Author} || ${Author} == AUTO ]] && Author="$(echo "${Github}" | cut -d "/" -f4)" [[ -z ${Author} || ${Author} == AUTO ]] && Author="$(cut -d "/" -f4 <<< ${Github})"
OP_AUTHOR="$(echo "${REPO_URL}" | cut -d "/" -f4)" OP_AUTHOR="$(cut -d "/" -f4 <<< ${REPO_URL})"
OP_REPO="$(echo "${REPO_URL}" | cut -d "/" -f5)" OP_REPO="$(cut -d "/" -f5 <<< ${REPO_URL})"
OP_BRANCH="$(Get_Branch)" OP_BRANCH="$(Get_Branch)"
if [[ ${OP_BRANCH} =~ (master|main) ]] if [[ ${OP_BRANCH} =~ (master|main) ]]
then then
OP_VERSION_HEAD="R$(date +%y.%m)-" OP_VERSION_HEAD="R$(date +%y.%m)-"
else else
OP_BRANCH="$(echo ${OP_BRANCH} | egrep -o "[0-9]+.[0-9]+" | awk 'NR==1')" OP_BRANCH="$(egrep -o "[0-9]+.[0-9]+" <<< ${OP_BRANCH} | awk 'NR==1')"
OP_VERSION_HEAD="R${OP_BRANCH}-" OP_VERSION_HEAD="R${OP_BRANCH}-"
fi fi
case "${OP_AUTHOR}/${OP_REPO}" in case "${OP_AUTHOR}/${OP_REPO}" in
@ -332,12 +332,12 @@ List_Fw() {
if [[ -z $* ]] if [[ -z $* ]]
then then
for X in $(List_sha256);do for X in $(List_sha256);do
echo ${X} | cut -d "*" -f2 cut -d "*" -f2 <<< "${X}"
done done
else else
while [[ $1 ]];do while [[ $1 ]];do
for X in $(List_sha256);do for X in $(List_sha256);do
[[ ${X} == *$1 ]] && echo "${X}" | cut -d "*" -f2 [[ ${X} == *$1 ]] && cut -d "*" -f2 <<< "${X}"
done done
shift shift
done done
@ -353,7 +353,7 @@ List_sha256() {
} }
List_MFormat() { List_MFormat() {
echo "$(List_sha256 | cut -d "*" -f2 | cut -d "." -f2-3)" | sort | uniq List_sha256 | cut -d "*" -f2 | cut -d "." -f2-3 | sort | uniq
} }
Get_sha256() { Get_sha256() {