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

Update diy-script.sh

This commit is contained in:
Hyy2001X 2020-09-16 23:45:32 +08:00 committed by GitHub
parent b472314200
commit 44de4530d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Scripts/diy-script.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
# AutoBuild Script Module by Hyy2001 # https://github.com/Hyy2001X/AutoBuild-Actions
# AutoBuild Module by Hyy2001
# AutoBuild Actions # AutoBuild Actions
Diy_Core() { Diy_Core() {
@ -11,10 +12,13 @@ TARGET_BOARD=ramips
TARGET_SUBTARGET=mt7621 TARGET_SUBTARGET=mt7621
TARGET_PROFILE=d-team_newifi-d2 TARGET_PROFILE=d-team_newifi-d2
TARGET_ROOTFS=squashfs-sysupgrade.bin TARGET_ROOTFS=squashfs-sysupgrade.bin
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'`
} }
ExtraPackages() { ExtraPackages() {
[ ! -d ./package/lean ] && mkdir ./package/lean
[ -d ./package/lean/$2 ] && rm -rf ./package/lean/$2 [ -d ./package/lean/$2 ] && rm -rf ./package/lean/$2
[ -d ./$2 ] && rm -rf ./$2 [ -d ./$2 ] && rm -rf ./$2
while [ ! -f $2/Makefile ] while [ ! -f $2/Makefile ]
@ -46,6 +50,7 @@ done
Diy-Part1() { Diy-Part1() {
sed -i "s/#src-git helloworld/src-git helloworld/g" feeds.conf.default sed -i "s/#src-git helloworld/src-git helloworld/g" feeds.conf.default
[ ! -d ./package/lean ] && mkdir ./package/lean
ExtraPackages git luci-theme-argon https://github.com/jerrykuku 18.06 ExtraPackages git luci-theme-argon https://github.com/jerrykuku 18.06
ExtraPackages svn luci-app-adguardhome https://github.com/Lienol/openwrt/trunk/package/diy ExtraPackages svn luci-app-adguardhome https://github.com/Lienol/openwrt/trunk/package/diy
ExtraPackages svn luci-app-smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t ExtraPackages svn luci-app-smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t
@ -55,27 +60,18 @@ ExtraPackages git Openwrt-AutoUpdate https://github.com/Hyy2001X master
} }
Diy-Part2() { Diy-Part2() {
Date=`date +%Y/%m/%d`
Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
echo "[$(date "+%H:%M:%S")] Current Openwrt version: $Version-`date +%Y%m%d`" echo "[$(date "+%H:%M:%S")] Current Openwrt version: $Version-`date +%Y%m%d`"
if [ ! $(grep -o "Compiled by $Author" $Default_File | wc -l) = "1" ];then if [ ! $(grep -o "Compiled by $Author" $Default_File | wc -l) = "1" ];then
sed -i "s?$Version?$Version Compiled by $Author [$Date]?g" $Default_File sed -i "s?$Version?$Version Compiled by $Author [$Compile_Date]?g" $Default_File
fi
Old_Date=`egrep -o "[0-9]+\/[0-9]+\/[0-9]+" $Default_File`
if [ ! $Date == $Old_Date ];then
sed -i "s?$Old_Date?$Date?g" $Default_File
fi fi
echo "$Version-`date +%Y%m%d`" > ./package/base-files/files/etc/openwrt_date 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 "[$(date "+%H:%M:%S")] Writing $Version-`date +%Y%m%d` to ./package/base-files/files/etc/openwrt_date ..."
} }
Diy-Part3() { Diy-Part3() {
Compile_Time=`date +'%Y-%m-%d %H:%M:%S'`
Version=`egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File`
Default_Firmware=openwrt-$TARGET_BOARD-$TARGET_SUBTARGET-$TARGET_PROFILE-$TARGET_ROOTFS Default_Firmware=openwrt-$TARGET_BOARD-$TARGET_SUBTARGET-$TARGET_PROFILE-$TARGET_ROOTFS
AutoBuild_Firmware=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.bin)` AutoBuild_Firmware=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.bin)`
AutoBuild_Detail=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.detail)` AutoBuild_Detail=AutoBuild-$TARGET_PROFILE-Lede-$Version`(date +-%Y%m%d.detail)`
mkdir -p ./bin/Firmware mkdir -p ./bin/Firmware
mv ./bin/targets/$TARGET_BOARD/$TARGET_SUBTARGET/$Default_Firmware ./bin/Firmware/$AutoBuild_Firmware mv ./bin/targets/$TARGET_BOARD/$TARGET_SUBTARGET/$Default_Firmware ./bin/Firmware/$AutoBuild_Firmware
cd ./bin/Firmware cd ./bin/Firmware