AutoBuild-Actions: 20211120 功能更新

2021/11/20 更新内容 1. 修改部分变量和函数名 2.0 workflows: 所有文件新增支持使用 /Configs 目录中的临时配置文件; 优化流程 2.1 workflows: 删除 AutoBuild.yml 3.0 AutoBuild_DiyScript.sh: 新增用户自定义变量 Author_URL=AUTO; 移除 Load_CustomPackages_List 3.1 AutoBuild_DiyScript.sh: 修改与新增预设变量 3.2 x86 设备在 lean 源码中默认修改为 ImmortalWrt 软件源 4. 删除软件包列表: AutoBuild_ExtraPackages.sh,所有内容移至 AutoBuild_DiyScript.sh 5. 删除无用文件: CustomFiles\Depends\{base-files-essential,Custom_Variable,DRM-I915}, 内容移至 AutoBuild_Function.sh 6. {Sync.sh,AutoUpdate.sh,AutoBuild_Function.sh} 同步改动 7. 重命名 {d-team_newifi-d2_mac80211.patch,d-team_newifi-d2_system} 8. 修改 x86 固件格式为 {BIOS,UEFI} 9. 固件升级保留列表添加 /.uuplugin_uuid 改动内容较大, 建议重新 Fork 本仓库
2026-09-18 08:20:11 +00:00 · 2021-11-20 22:04:51 +08:00
parent 689e53f08c
commit 64e87c84df
18 changed files with 596 additions and 670 deletions
@@ -2,127 +2,150 @@
 # AutoBuild Module by Hyy2001 <https://github.com/Hyy2001X/AutoBuild-Actions>
 # AutoBuild Functions

-Firmware-Diy_Before() {
-	ECHO "[Firmware-Diy_Before] Start ..."
-	CD ${GITHUB_WORKSPACE}/openwrt
-	Diy_Core
+Firmware_Diy_Before() {
+	ECHO "[Firmware_Diy_Before] Starting ..."
 	Home="${GITHUB_WORKSPACE}/openwrt"
-	[[ -f ${GITHUB_WORKSPACE}/Openwrt.info ]] && source ${GITHUB_WORKSPACE}/Openwrt.info
+	CONFIG_TEMP="${GITHUB_WORKSPACE}/openwrt/.config"
+	CD ${Home}
+	Firmware_Diy_Core
 	[[ ${Short_Firmware_Date} == true ]] && Compile_Date="$(echo ${Compile_Date} | cut -c1-8)"
-	Author_Repository="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100 | sed 's/^[ \t]*//g')"
-	[[ -z ${Author} ]] && Author="$(echo "${Author_Repository}" | cut -d "/" -f4)"
-	OP_Maintainer="$(echo "${Openwrt_Repository}" | cut -d "/" -f4)"
-	OP_REPO_NAME="$(echo "${Openwrt_Repository}" | cut -d "/" -f5)"
+	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)"
+	OP_AUTHOR="$(echo "${REPO_URL}" | cut -d "/" -f4)"
+	OP_REPO="$(echo "${REPO_URL}" | cut -d "/" -f5)"
 	OP_BRANCH="$(GET_Branch)"
-	if [[ ${OP_BRANCH} == master || ${OP_BRANCH} == main ]];then
-		Openwrt_Version_Head="R$(date +%y.%m)-"
+	if [[ ${OP_BRANCH} =~ (master|main) ]]
+	then
+		OP_VERSION_HEAD="R$(date +%y.%m)-"
 	else
 		OP_BRANCH="$(echo ${OP_BRANCH} | egrep -o "[0-9]+.[0-9]+")"
-		Openwrt_Version_Head="R${OP_BRANCH}-"
+		OP_VERSION_HEAD="R${OP_BRANCH}-"
 	fi
-	case "${OP_Maintainer}/${OP_REPO_NAME}" in
+	case "${OP_AUTHOR}/${OP_REPO}" in
 	coolsnowwolf/lede)
-		Version_File=package/lean/default-settings/files/zzz-default-settings
+		Version_File="package/lean/default-settings/files/zzz-default-settings"
 		zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
-		CURRENT_Version="${zzz_Default_Version}-${Compile_Date}"
+		OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
 	;;
 	immortalwrt/immortalwrt)
-		Version_File=${base_files}/etc/openwrt_release
-		CURRENT_Version="${Openwrt_Version_Head}${Compile_Date}"
+		Version_File=${BASE_FILES}/etc/openwrt_release
+		OP_VERSION="${OP_VERSION_HEAD}${Compile_Date}"
 	;;
 	*)
-		CURRENT_Version="${Openwrt_Version_Head}${Compile_Date}"
+		OP_VERSION="${OP_VERSION_HEAD}${Compile_Date}"
 	;;
 	esac
 	while [[ -z ${x86_Test} ]];do
-		x86_Test="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/CONFIG_TARGET_(.*)_DEVICE_(.*)=y/\1/')"
+		x86_Test="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" ${CONFIG_TEMP} | sed -r 's/CONFIG_TARGET_(.*)_DEVICE_(.*)=y/\1/')"
 		[[ -n ${x86_Test} ]] && break
-		x86_Test="$(egrep -o "CONFIG_TARGET.*Generic=y" .config | sed -r 's/CONFIG_TARGET_(.*)_Generic=y/\1/')"
+		x86_Test="$(egrep -o "CONFIG_TARGET.*Generic=y" ${CONFIG_TEMP} | sed -r 's/CONFIG_TARGET_(.*)_Generic=y/\1/')"
 		[[ -z ${x86_Test} ]] && break
 	done
 	[[ ${x86_Test} == x86_64 ]] && {
 		TARGET_PROFILE=x86_64
 	} || {
-		TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/')"
+		TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" ${CONFIG_TEMP} | sed -r 's/.*DEVICE_(.*)=y/\1/')"
 	}
-	[[ -z ${TARGET_PROFILE} ]] && ECHO "Unable to obtain the [TARGET_PROFILE] !"
-	TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config)"
-	TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)"
-	[[ -z ${Firmware_Format} || ${Firmware_Format} == false ]] && {
+	[[ -z ${TARGET_PROFILE} ]] && ECHO "Unable to get [TARGET_PROFILE] !"
+	TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' ${CONFIG_TEMP})"
+	TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' ${CONFIG_TEMP})"
+	[[ -z ${Firmware_Format} || ${Firmware_Format} =~ (false|AUTO) ]] && {
 		case "${TARGET_BOARD}" in
 		ramips | reltek | ipq40xx | ath79 | ipq807x)
 			Firmware_Format=bin
 		;;
 		rockchip | x86)
-			[[ $(cat ${Home}/.config) =~ CONFIG_TARGET_IMAGES_GZIP=y ]] && {
-				Firmware_Format=img.gz || Firmware_Format=img
-			}
+			[[ $(cat ${CONFIG_TEMP}) =~ CONFIG_TARGET_IMAGES_GZIP=y ]] && {
+				Firmware_Format=img.gz
+			} || Firmware_Format=img
 		;;
 		esac
 	}
 	case "${TARGET_BOARD}" in
 	x86)
-		AutoBuild_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-${CURRENT_Version}-${FW_Boot_Type}-$(Get_SHA256 $1).${Firmware_Format_Defined}'
+		AutoBuild_Firmware="AutoBuild-${OP_REPO}-${TARGET_PROFILE}-${OP_VERSION}-BOOT-SHA256.FORMAT"
 	;;
 	*)
-		AutoBuild_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-${CURRENT_Version}-$(Get_SHA256 $1).${Firmware_Format_Defined}'
+		AutoBuild_Firmware="AutoBuild-${OP_REPO}-${TARGET_PROFILE}-${OP_VERSION}-SHA256.FORMAT"
 	;;
 	esac
-	cat >> ${Home}/VARIABLE_Main <<EOF
-Author=${Author}
-Github=${Author_Repository}
-TARGET_PROFILE=${TARGET_PROFILE}
-TARGET_BOARD=${TARGET_BOARD}
-TARGET_SUBTARGET=${TARGET_SUBTARGET}
-Firmware_Format=${Firmware_Format}
-CURRENT_Version=${CURRENT_Version}
-OP_Maintainer=${OP_Maintainer}
-OP_BRANCH=${OP_BRANCH}
-OP_REPO_NAME=${OP_REPO_NAME}
-EOF
-	cat >> ${Home}/VARIABLE_FILE <<EOF
+
+	cat >> ${GITHUB_ENV} <<EOF
 Home=${Home}
-PKG_Compatible="${INCLUDE_Obsolete_PKG_Compatible}"
-Checkout_Virtual_Images="${Checkout_Virtual_Images}"
-Firmware_Path=${Home}/bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}
+CONFIG_TEMP=${CONFIG_TEMP}
+INCLUDE_AutoBuild_Features=${INCLUDE_AutoBuild_Features}
+INCLUDE_Original_OpenWrt_Compatible=${INCLUDE_Original_OpenWrt_Compatible}
+INCLUDE_DRM_I915=${INCLUDE_DRM_I915}
+Checkout_Virtual_Images=${Checkout_Virtual_Images}
 AutoBuild_Firmware=${AutoBuild_Firmware}
 CustomFiles=${GITHUB_WORKSPACE}/CustomFiles
 Scripts=${GITHUB_WORKSPACE}/Scripts
-feeds_luci=${GITHUB_WORKSPACE}/openwrt/package/feeds/luci
-feeds_pkgs=${GITHUB_WORKSPACE}/openwrt/package/feeds/packages
-base_files=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
-Banner_Title="${Banner_Title}"
+FEEDS_LUCI=${GITHUB_WORKSPACE}/openwrt/package/feeds/luci
+FEEDS_PKG=${GITHUB_WORKSPACE}/openwrt/package/feeds/packages
+BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
+Banner_Message="${Banner_Message}"
 REGEX_Skip_Checkout="${REGEX_Skip_Checkout}"
+Version_File=${Version_File}
+Firmware_Format=${Firmware_Format}
+FEEDS_CONF=${Home}/feeds.conf.default
+Author_URL=${Author_URL}
+ENV_FILE=${GITHUB_ENV}
+
 EOF
-	echo "$(cat ${Home}/VARIABLE_Main)" >> ${Home}/VARIABLE_FILE
-	echo -e "### SYS-VARIABLE LIST ###\n$(cat ${Home}/VARIABLE_FILE)\n"
-	ECHO "[Firmware-Diy_Before] Done."
+	source ${GITHUB_ENV}
+	echo -e "### VARIABLE LIST ###\n$(cat ${GITHUB_ENV})\n"
+	ECHO "[Firmware_Diy_Before] Done"
 }

-Firmware-Diy_Main() {
-	Firmware-Diy_Before
-	ECHO "[Firmware-Diy_Main] Start ..."
+Firmware_Diy_Main() {
+	Firmware_Diy_Before
+	ECHO "[Firmware_Diy_Main] Starting ..."
 	CD ${Home}
-	source ${Home}/VARIABLE_FILE
 	chmod +x -R ${Scripts}
 	chmod 777 -R ${CustomFiles}
-	[[ ${Load_CustomPackages_List} == true ]] && {
-		bash -n ${Scripts}/AutoBuild_ExtraPackages.sh
-		[[ ! $? == 0 ]] && ECHO "AutoBuild_ExtraPackages.sh syntax error,skip ..." || {
-			. ${Scripts}/AutoBuild_ExtraPackages.sh
-		}
-	}
-	if [[ ${INCLUDE_AutoBuild_Features} == true ]];then
-		MKDIR ${base_files}/etc/AutoBuild
-		cp ${Home}/VARIABLE_Main ${base_files}/etc/AutoBuild/Default_Variable
-		Copy ${CustomFiles}/Depends/Custom_Variable ${base_files}/etc/AutoBuild
-		Copy ${Scripts}/AutoBuild_Tools.sh ${base_files}/bin
-		Copy ${Scripts}/AutoUpdate.sh ${base_files}/bin
+	if [[ ${INCLUDE_AutoBuild_Features} == true ]]
+	then
+		MKDIR ${BASE_FILES}/etc/AutoBuild
+		touch ${BASE_FILES}/etc/AutoBuild/Default_Variable ${BASE_FILES}/etc/AutoBuild/Custom_Variable
+		cat >> ${BASE_FILES}/etc/AutoBuild/Default_Variable <<EOF
+## 请不要修改此文件中的内容, 自定义变量请在 Custom_Variable 中添加或修改
+## 该文件将在运行 AutoUpdate.sh 时被读取, 该文件中的变量优先级低于 Custom_Variable
+
+EOF
+		for i in ${BASE_FILES}/etc/AutoBuild/Default_Variable ${GITHUB_ENV}
+		do
+			cat >> ${i} <<EOF
+Author=${Author}
+Github=${Github}
+TARGET_PROFILE=${TARGET_PROFILE}
+TARGET_BOARD=${TARGET_BOARD}
+TARGET_SUBTARGET=${TARGET_SUBTARGET}
+OP_VERSION=${OP_VERSION}
+OP_AUTHOR=${OP_AUTHOR}
+OP_REPO=${OP_REPO}
+OP_BRANCH=${OP_BRANCH}
+
+EOF
+		done
+		unset i
+		cat >> ${BASE_FILES}/etc/AutoBuild/Custom_Variable <<EOF
+## 请在下方输入你的自定义变量,一行只能填写一个变量
+## 该文件将在运行 AutoUpdate.sh 时被读取, 该文件中的变量优先级高于 Default_Variable
+## 示例:
+# Author=Hyy2001
+# TARGET_PROFILE=x86_64
+# Github=https://github.com/Hyy2001X/AutoBuild-Actions
+# Tmp_Path=/tmp/AutoUpdate
+# Log_Path=/tmp
+
+EOF
+		Copy ${Scripts}/AutoBuild_Tools.sh ${BASE_FILES}/bin
+		Copy ${Scripts}/AutoUpdate.sh ${BASE_FILES}/bin
+		AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${BASE_FILES}/bin/AutoUpdate.sh | awk 'NR==1')
 		AddPackage svn lean luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk
-		Copy ${CustomFiles}/Depends/profile ${base_files}/etc
-		Copy ${CustomFiles}/Depends/base-files-essential ${base_files}/lib/upgrade/keep.d
-		AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${base_files}/bin/AutoUpdate.sh | awk 'NR==1')
-		case "${OP_Maintainer}/${OP_REPO_NAME}" in
+		Copy ${CustomFiles}/Depends/profile ${BASE_FILES}/etc
+		Copy ${CustomFiles}/Depends/base-files-essential ${BASE_FILES}/lib/upgrade/keep.d
+		case "${OP_AUTHOR}/${OP_REPO}" in
 		coolsnowwolf/lede)
 			Copy ${CustomFiles}/Depends/coremark.sh ${Home}/$(PKG_Finder d "package feeds" coremark)
 			sed -i '\/etc\/firewall.user/d;/exit 0/d' ${Version_File}
@@ -160,60 +183,75 @@ EOF
 			sed -i 's/143/143,8080,8443/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
 		;;
 		immortalwrt/immortalwrt)
-			Copy ${CustomFiles}/Depends/openwrt_release_${OP_Maintainer} ${base_files}/etc openwrt_release
+			Copy ${CustomFiles}/Depends/openwrt_release_${OP_AUTHOR} ${BASE_FILES}/etc openwrt_release
 			sed -i "s?ImmortalWrt?ImmortalWrt @ ${Author} [${Display_Date}]?g" ${Version_File}
 		;;
 		esac
 		sed -i "s?By?By ${Author}?g" ${CustomFiles}/Depends/banner
-		sed -i "s?Openwrt?Openwrt ${CURRENT_Version} / AutoUpdate ${AutoUpdate_Version}?g" ${CustomFiles}/Depends/banner
-		[[ -n ${Banner_Title} ]] && sed -i "s?Powered by AutoBuild-Actions?${Banner_Title}?g" ${CustomFiles}/Depends/banner
-		case "${OP_Maintainer}/${OP_REPO_NAME}" in
+		sed -i "s?Openwrt?Openwrt ${OP_VERSION} / AutoUpdate ${AutoUpdate_Version}?g" ${CustomFiles}/Depends/banner
+		[[ -n ${Banner_Message} ]] && sed -i "s?Powered by AutoBuild-Actions?${Banner_Message}?g" ${CustomFiles}/Depends/banner
+		case "${OP_AUTHOR}/${OP_REPO}" in
 		immortalwrt/immortalwrt)
 			Copy ${CustomFiles}/Depends/banner ${Home}/$(PKG_Finder d package default-settings)/files openwrt_banner
 		;;
 		*)
-			Copy ${CustomFiles}/Depends/banner ${base_files}/etc
+			Copy ${CustomFiles}/Depends/banner ${BASE_FILES}/etc
 		;;
 		esac
 	fi
-	[[ -n ${Before_IP_Address} ]] && Default_LAN_IP="${Before_IP_Address}"
-	[[ -n ${Default_LAN_IP} && ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && {
-		Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' ${base_files}/bin/config_generate | awk 'NR==1')
-		if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then
-			ECHO "Setting default IP Address to ${Default_LAN_IP} ..."
-			sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" ${base_files}/bin/config_generate
+	[[ -n ${Tempoary_IP} ]] && {
+		ECHO "Using Tempoary IP Address: ${Tempoary_IP} ..."
+		Default_IP="${Tempoary_IP}"
+	}
+	[[ -n ${Default_IP} && ${Default_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && {
+		Old_IP=$(awk -F '[="]+' '/ipaddr:-/{print $3}' ${BASE_FILES}/bin/config_generate | awk 'NR==1')
+		if [[ ! ${Default_IP} == ${Old_IP} ]]
+		then
+			ECHO "Setting default IP Address to ${Default_IP} ..."
+			sed -i "s/${Old_IP}/${Default_IP}/g" ${BASE_FILES}/bin/config_generate
 		fi
 	}
 	[[ ${INCLUDE_DRM_I915} == true && ${TARGET_BOARD} == x86 ]] && {
-		Copy ${CustomFiles}/Depends/DRM-I915 ${Home}/target/linux/x86
-		for X in $(ls -1 target/linux/x86 | grep "config-"); do echo -e "\n$(cat target/linux/x86/DRM-I915)" >> target/linux/x86/${X}; done
+		for X in $(ls -1 target/linux/x86 | grep "config-")
+		do
+			cat >> ${Home}/target/linux/x86/${X} <<EOF
+
+CONFIG_64BIT=y
+CONFIG_DRM=y
+CONFIG_DRM_I915=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DUMMY_CONSOLE=y
+EOF
+		done
+		unset X
 	}
-	ECHO "[Firmware-Diy_Main] Done."
+	ECHO "[Firmware_Diy_Main] Done"
 }

-Firmware-Diy_Other() {
-	ECHO "[Firmware-Diy_Other] Start ..."
-	CD ${GITHUB_WORKSPACE}/openwrt
-	source ${GITHUB_WORKSPACE}/openwrt/VARIABLE_FILE
-	case "${PKG_Compatible}" in
+Firmware_Diy_Other() {
+	ECHO "[Firmware_Diy_Other] Starting ..."
+	CD ${Home}
+	case "${INCLUDE_Original_OpenWrt_Compatible}" in
 	19.07)
 		OP_BRANCH=19.07
 		Force_mode=1
-		PKG_Compatible=true
+		INCLUDE_Original_OpenWrt_Compatible=true
 	;;
 	21.02)
 		OP_BRANCH=21.02
 		Force_mode=1
-		PKG_Compatible=true
+		INCLUDE_Original_OpenWrt_Compatible=true
 	;;
 	esac
-	if [[ ${PKG_Compatible} == true ]];then
-		if [[ ${OP_Maintainer} == openwrt || ${OP_Maintainer} == [Ll]ienol || ${Force_mode} == 1 ]];then
-			ECHO "Start running Obsolete_Package_Compatible Script ..."
+	if [[ ${INCLUDE_Original_OpenWrt_Compatible} == true ]]
+	then
+		if [[ ${OP_AUTHOR} =~ (openwrt|[Ll]ienol) || ${Force_mode} == 1 ]]
+		then
+			ECHO "Starting to run [Obsolete_Package_Compatible] Script ..."
 			case "${OP_BRANCH}" in
 			19.07 | 21.02 | main)
 				[[ ${OP_BRANCH} == main ]] && OP_BRANCH=21.02
-				cat >> .config <<EOF
+				cat >> ${CONFIG_TEMP} <<EOF

 # CONFIG_PACKAGE_dnsmasq is not set
 CONFIG_PACKAGE_dnsmasq-full=y
@@ -224,29 +262,33 @@ EOF
 				cat 0003-upx-ucl-${OP_BRANCH}.patch | patch -p1 > /dev/null 2>&1
 				AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang
 				ECHO "Starting to convert zh-cn translation files to zh_Hans ..."
-				cd package && ${Scripts}/Convert_Translation.sh && cd -
+				cd package && bash ${Scripts}/Convert_Translation.sh && cd -
 			;;
 			*)
-				ECHO "[${OP_BRANCH}]: Current Branch is not supported ..."
+				ECHO "[${OP_BRANCH}]: Current OP_BRANCH is not supported !"
 			;;
 			esac
 		else
-			ECHO "[${OP_Maintainer}]: Current Source_Maintainer is not supported ..."
+			ECHO "[${OP_AUTHOR}]: Current OP_AUTHOR is not supported !"
 		fi
 	fi
-	cat >> .config <<EOF
+	if [[ ${Author_URL} != false ]]
+	then
+		[[ ${Author_URL} == AUTO ]] && Author_URL=${Github}
+			cat >> ${CONFIG_TEMP} <<EOF

 CONFIG_KERNEL_BUILD_USER="${Author}"
-CONFIG_KERNEL_BUILD_DOMAIN="${Github}"
+CONFIG_KERNEL_BUILD_DOMAIN="${Author_URL}"
 EOF
-	ECHO "[Firmware-Diy_Other] Done."
+	fi
+	ECHO "[Firmware_Diy_Other] Done"
 }

-Firmware-Diy_End() {
-	ECHO "[Firmware-Diy_End] Start ..."
-	CD ${GITHUB_WORKSPACE}/openwrt
-	source ${GITHUB_WORKSPACE}/openwrt/VARIABLE_FILE
-	MKDIR bin/Firmware
+Firmware_Diy_End() {
+	ECHO "[Firmware_Diy_End] Starting ..."
+	cd ${Home}
+	MKDIR ${Home}/bin/Firmware
+	Firmware_Path="${Home}/bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}"
 	SHA256_File="${Firmware_Path}/sha256sums"
 	cd ${Firmware_Path}
 	echo -e "### FIRMWARE OUTPUT ###\n$(ls -1 | egrep -v "packages|buildinfo|sha256sums|manifest")\n"
@@ -262,10 +304,12 @@ Firmware-Diy_End() {
 		Process_Firmware ${Firmware_Format}
 	;;
 	esac
-	[[ $(ls) =~ 'AutoBuild-' ]] && cp -a AutoBuild-* ${Home}/bin/Firmware
-	cd -
+	[[ $(ls) =~ 'AutoBuild-' ]] && {
+		cd -
+		cp -a ${Firmware_Path}/AutoBuild-* bin/Firmware
+	}
 	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"
 }

 Process_Firmware() {
@@ -279,16 +323,17 @@ Process_Firmware_Core() {
 	Firmware_Format_Defined=$1
 	shift
 	while [[ $1 ]];do
+		AutoBuild_Firmware=$(Get_Variable AutoBuild_Firmware)
 		case "${TARGET_BOARD}" in
 		x86)
 			[[ $1 =~ efi ]] && {
-				FW_Boot_Type=UEFI
-			} || {
-				FW_Boot_Type=Legacy
-			}
+				FW_Boot_Method=UEFI
+			} || FW_Boot_Method=BIOS
+			AutoBuild_Firmware=${AutoBuild_Firmware/BOOT/${FW_Boot_Method}}
 		;;
 		esac
-		eval AutoBuild_Firmware=$(Get_Variable AutoBuild_Firmware=)
+		AutoBuild_Firmware=${AutoBuild_Firmware/SHA256/$(Get_SHA256 $1)}
+		AutoBuild_Firmware=${AutoBuild_Firmware/FORMAT/${Firmware_Format_Defined}}
 		[[ -f $1 ]] && {
 			ECHO "Copying [$1] to [${AutoBuild_Firmware}] ..."
 			cp -a $1 ${AutoBuild_Firmware}
@@ -300,12 +345,12 @@ Process_Firmware_Core() {
 List_Firmware() {
 	[[ -z $* ]] && {
 		List_REGEX | while read X;do
-			echo $X | cut -d "*" -f2
+			echo ${X} | cut -d "*" -f2
 		done
 	} || {
 		while [[ $1 ]];do
 			for X in $(echo $(List_REGEX));do
-				[[ $X == *$1 ]] && echo "$X" | cut -d "*" -f2
+				[[ ${X} == *$1 ]] && echo "${X}" | cut -d "*" -f2
 			done
 			shift
 		done
@@ -327,7 +372,14 @@ Get_SHA256() {
 }

 Get_Variable() {
-	grep "$1" ${GITHUB_WORKSPACE}/openwrt/VARIABLE_FILE | cut -c$(echo $1 | wc -c)-200 | cut -d ":" -f2
+	local Result="$(grep "$1" ${ENV_FILE} | grep -v "#" | awk -F '=' '{print $2}')"
+	if [[ -n ${Result} ]]
+	then
+		eval echo "${Result}"
+		return 0
+	else
+		return 1
+	fi
 }

 GET_Branch() {
@@ -352,12 +404,13 @@ PKG_Finder() {

 CD() {
 	cd $1
-	[[ ! $? == 0 ]] && ECHO "Unable to enter target directory $1 ..." || ECHO "Current runnning directory: $(pwd)"
+	[[ ! $? == 0 ]] && ECHO "Unable to enter target directory $1 ..." || ECHO "Entering directory: $(pwd) ..."
 }

 MKDIR() {
 	while [[ $1 ]];do
-		if [[ ! -d $1 ]];then
+		if [[ ! -d $1 ]]
+		then
 			mkdir -p $1 || ECHO "Failed to create target directory: [$1] ..."
 		fi
 		shift
@@ -384,7 +437,7 @@ AddPackage() {
 	PKG_NAME=$3
 	REPO_URL="https://github.com/$4"
 	REPO_BRANCH=$5
-	[[ ${REPO_URL} =~ "${OP_Maintainer}/${OP_REPO_NAME}" ]] && return 0
+	[[ ${REPO_URL} =~ "${OP_AUTHOR}/${OP_REPO}" ]] && return 0

 	MKDIR ${PKG_DIR}
 	[[ -d ${PKG_DIR}/${PKG_NAME} ]] && {
@@ -407,7 +460,7 @@ AddPackage() {
 	esac
 	[[ -f ${PKG_NAME}/Makefile || -n $(ls -A ${PKG_NAME}) ]] && {
 		mv -f "${PKG_NAME}" "${PKG_DIR}"
-		[[ $? == 0 ]] && ECHO "Done."
+		[[ $? == 0 ]] && ECHO "Done"
 	} || ECHO "Failed to download package ${PKG_NAME} ..."
 }

@@ -421,12 +474,13 @@ Copy() {
 		return 0
 	}
 	MKDIR $2
-	if [[ -z $3 ]];then
+	if [[ -z $3 ]]
+	then
 		ECHO "Copying $1 to $2 ..."
 		cp -a $1 $2
 	else
-		ECHO "Copy and renaming $1 to $2/$3 ..."
+		ECHO "Copying and renaming $1 to $2/$3 ..."
 		cp -a $1 $2/$3
 	fi
-	[[ $? == 0 ]] && ECHO "Done." || ECHO "Failed."
+	[[ $? == 0 ]] && ECHO "Done" || ECHO "Failed"
 }