From 3d5dc483bab7ddb19a746421ba69d8843f0131b3 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sat, 24 Oct 2020 23:41:40 +0800
Subject: [PATCH] bump mac80211 to latest version

---
 Scripts/diy-script.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Scripts/diy-script.sh b/Scripts/diy-script.sh
index 5d4bb8f..d0e4457 100644
--- a/Scripts/diy-script.sh
+++ b/Scripts/diy-script.sh
@@ -5,17 +5,20 @@
 
 Diy_Core() {
 Author=Hyy2001
+Default_Device=d-team_newifi-d2
 
-Default_File=./package/lean/default-settings/files/zzz-default-settings
-Lede_Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
 Openwrt_Version="$Lede_Version-`date +%Y%m%d`"
 AutoUpdate_Version=`awk 'NR==6' ./package/base-files/files/bin/AutoUpdate.sh | awk -F'[="]+' '/Version/{print $2}'`
 Compile_Date=`date +'%Y/%m/%d'`
 Compile_Time=`date +'%Y-%m-%d %H:%M:%S'`
+Default_File=./package/lean/default-settings/files/zzz-default-settings
+Lede_Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
 }
 
 GET_TARGET_INFO() {
+Diy_Core
 TARGET_PROFILE=`egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/'`
+[ -z $TARGET_PROFILE ] && TARGET_PROFILE=$Default_Device
 TARGET_BOARD=`awk -F'[="]+' '/TARGET_BOARD/{print $2}' .config`
 TARGET_SUBTARGET=`awk -F'[="]+' '/TARGET_SUBTARGET/{print $2}' .config`
 }
@@ -35,7 +38,7 @@ do
 		svn checkout $3/$2 $2 > /dev/null 2>&1
 	esac
 	if [ -f $2/Makefile ] || [ -f $2/README* ];then
-		echo "[$(date "+%H:%M:%S")] Package $2 detected!"
+		echo "[$(date "+%H:%M:%S")] Package $2 is detected!"
 		case $2 in
 		OpenClash)
 			mv -f ./$2/luci-app-openclash ./package/lean
@@ -60,7 +63,7 @@ done
 
 mv2() {
 if [ -f $GITHUB_WORKSPACE/Customize/$1 ];then
-	echo "[$(date "+%H:%M:%S")] File [$1] is detected!"
+	echo "[$(date "+%H:%M:%S")] Custom File [$1] is detected!"
 	if [ -z $2 ];then
 		Patch_Dir=$GITHUB_WORKSPACE/openwrt
 	else
@@ -75,12 +78,12 @@ if [ -f $GITHUB_WORKSPACE/Customize/$1 ];then
 		mv -f $GITHUB_WORKSPACE/Customize/$1 $Patch_Dir/$3
 	fi
 else
-	echo "[$(date "+%H:%M:%S")] File [$1] is not detected!"
+	echo "[$(date "+%H:%M:%S")] Custom File [$1] is not detected!"
 fi
 }
 
 Diy-Part1() {
-sed -i "s/#src-git helloworld/src-git helloworld/g" feeds.conf.default
+[ -f feeds.conf.default ] && sed -i "s/#src-git helloworld/src-git helloworld/g" feeds.conf.default
 [ ! -d ./package/lean ] && mkdir ./package/lean
 
 # mv2 feeds.conf.default
@@ -90,6 +93,9 @@ mv2 AutoUpdate.sh package/base-files/files/bin
 mv2 banner package/base-files/files/etc
 mv2 mt76.mk package/kernel/mt76 Makefile
 
+ExtraPackages svn mac80211 https://github.com/openwrt/openwrt/trunk/package/kernel
+rm -rf package/kernel/mac80211 && mv -f package/lean/mac80211 package/kernel
+
 ExtraPackages git luci-app-autoupdate https://github.com/Hyy2001X main
 ExtraPackages git luci-theme-argon https://github.com/jerrykuku 18.06
 ExtraPackages git luci-app-adguardhome https://github.com/Hyy2001X master
@@ -101,28 +107,26 @@ ExtraPackages svn luci-app-socat https://github.com/xiaorouji/openwrt-package/tr
 # ExtraPackages git openwrt-upx https://github.com/Hyy2001X master
 # ExtraPackages svn luci-app-mentohust https://github.com/project-openwrt/openwrt/trunk/package/ctcgfw
 # ExtraPackages svn mentohust https://github.com/project-openwrt/openwrt/trunk/package/ctcgfw
-ExtraPackages svn luci-theme-opentomato https://github.com/kenzok8/openwrt-packages/trunk
-ExtraPackages svn luci-theme-opentomcat https://github.com/kenzok8/openwrt-packages/trunk
+#ExtraPackages svn luci-theme-opentomato https://github.com/kenzok8/openwrt-packages/trunk
+#ExtraPackages svn luci-theme-opentomcat https://github.com/kenzok8/openwrt-packages/trunk
 # ExtraPackages svn luci-app-adguardhome https://github.com/Lienol/openwrt/trunk/package/diy
 # ExtraPackages git luci-app-adguardhome https://github.com/rufengsuixing master
 # ExtraPackages git openwrt-OpenAppFilter https://github.com/Lienol master
 }
 
 Diy-Part2() {
-Diy_Core
 GET_TARGET_INFO
 mv2 mwan3 package/feeds/packages/mwan3/files/etc/config
 echo "Author: $Author"
-echo "Openwrt Version: $Openwrt_Version"
+echo "Lede Version: $Openwrt_Version"
 echo "AutoUpdate Version: $AutoUpdate_Version"
-echo "Device: $TARGET_PROFILE"
+echo "Router: $TARGET_PROFILE"
 sed -i "s?$Lede_Version?$Lede_Version Compiled by $Author [$Compile_Date]?g" $Default_File
 echo "$Openwrt_Version" > ./package/base-files/files/etc/openwrt_info
 sed -i "s?Openwrt?Openwrt $Openwrt_Version / AutoUpdate $AutoUpdate_Version?g" ./package/base-files/files/etc/banner
 }
 
 Diy-Part3() {
-Diy_Core
 GET_TARGET_INFO
 Default_Firmware=openwrt-$TARGET_BOARD-$TARGET_SUBTARGET-$TARGET_PROFILE-squashfs-sysupgrade.bin
 AutoBuild_Firmware=AutoBuild-$TARGET_PROFILE-Lede-${Openwrt_Version}.bin