xinb/X-OpenWrt
1
0
Fork 0
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git synced 2026-09-18 08:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge code from BETA repo

Browse Source
This commit is contained in:
Hyy2001X
2020-09-19 15:37:55 +08:00
parent 44de4530d9
commit c2e17543cd
4 changed files with 140 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/diy-script.sh
+18 -18
View File
@@ -5,19 +5,20 @@
Diy_Core() {
Author=Hyy2001
Github=https://github.com/Hyy2001X
AutoUpdate_Github=https://github.com/Hyy2001X/Openwrt-AutoUpdate
Default_File=./package/lean/default-settings/files/zzz-default-settings
TARGET_BOARD=ramips
TARGET_SUBTARGET=mt7621
TARGET_PROFILE=d-team_newifi-d2
TARGET_ROOTFS=squashfs-sysupgrade.bin
Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
Default_File=./package/lean/default-settings/files/zzz-default-settings
FIRMWARE_SUFFIX=squashfs-sysupgrade.bin
Lede_Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
Compile_Date=`date +'%Y/%m/%d'`
Compile_Time=`date +'%Y-%m-%d %H:%M:%S'`
}
GET_TARGET_INFO() {
TARGET_BOARD=`awk -F'[="]+' '/TARGET_BOARD/{print $2}' .config`
TARGET_SUBTARGET=`awk -F'[="]+' '/TARGET_SUBTARGET/{print $2}' .config`
TARGET_PROFILE=`grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/'`
}
ExtraPackages() {
[ -d ./package/lean/$2 ] && rm -rf ./package/lean/$2
[ -d ./$2 ] && rm -rf ./$2
@@ -33,8 +34,6 @@ do
echo "[$(date "+%H:%M:%S")] Package $2 detected!"
if [ $2 == OpenClash ];then
mv $2/luci-app-openclash ./package/lean
elif [ $2 == Openwrt-AutoUpdate ];then
mv $2/AutoUpdate.sh ./package/base-files/files/bin
else
mv $2 ./package/lean
fi
@@ -56,22 +55,23 @@ ExtraPackages svn luci-app-adguardhome https://github.com/Lienol/openwrt/trunk/p
ExtraPackages svn luci-app-smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t
ExtraPackages svn smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t
ExtraPackages git OpenClash https://github.com/vernesong master
ExtraPackages git Openwrt-AutoUpdate https://github.com/Hyy2001X master
}
Diy-Part2() {
echo "[$(date "+%H:%M:%S")] Current Openwrt version: $Version-`date +%Y%m%d`"
echo "[$(date "+%H:%M:%S")] Current Openwrt version: $Lede_Version-`date +%Y%m%d`"
if [ ! $(grep -o "Compiled by $Author" $Default_File | wc -l) = "1" ];then
sed -i "s?$Version?$Version Compiled by $Author [$Compile_Date]?g" $Default_File
sed -i "s?$Lede_Version?$Lede_Version Compiled by $Author [$Compile_Date]?g" $Default_File
fi
echo "$Version-`date +%Y%m%d`" > ./package/base-files/files/etc/openwrt_date
echo "[$(date "+%H:%M:%S")] Writing $Version-`date +%Y%m%d` to ./package/base-files/files/etc/openwrt_date ..."
echo "$Lede_Version-`date +%Y%m%d`" > ./package/base-files/files/etc/openwrt_date
echo "[$(date "+%H:%M:%S")] Writing $Lede_Version-`date +%Y%m%d` to ./package/base-files/files/etc/openwrt_date ..."
echo "[$(date "+%H:%M:%S")] Writing $TARGET_PROFILE to ./package/base-files/files/etc/openwrt_device ..."
}
Diy-Part3() {
Default_Firmware=openwrt-$TARGET_BOARD-$TARGET_SUBTARGET-$TARGET_PROFILE-$TARGET_ROOTFS
AutoBuild_Firmware=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.bin)`
AutoBuild_Detail=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.detail)`
GET_TARGET_INFO
Default_Firmware=openwrt-$TARGET_BOARD-$TARGET_SUBTARGET-$TARGET_PROFILE-$FIRMWARE_SUFFIX
AutoBuild_Firmware=AutoBuild-$TARGET_PROFILE-Lede-$Lede_Version`(date +-%Y%m%d.bin)`
AutoBuild_Detail=AutoBuild-$TARGET_PROFILE-Lede-$Lede_Version`(date +-%Y%m%d.detail)`
mkdir -p ./bin/Firmware
mv ./bin/targets/$TARGET_BOARD/$TARGET_SUBTARGET/$Default_Firmware ./bin/Firmware/$AutoBuild_Firmware
cd ./bin/Firmware