From d66d0d55b15143784d7422aef192b7790b19873e Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Wed, 16 Sep 2020 17:43:10 +0800
Subject: [PATCH] Adjust code

---
 Scripts/diy-part1.sh | 51 +++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/Scripts/diy-part1.sh b/Scripts/diy-part1.sh
index b52439f..ee31307 100644
--- a/Scripts/diy-part1.sh
+++ b/Scripts/diy-part1.sh
@@ -1,37 +1,34 @@
 #!/bin/bash
 
-Github=https://github.com/Hyy2001X/Openwrt-AutoUpdate
+AutoUpdate_Github=https://github.com/Hyy2001X/Openwrt-AutoUpdate
 
-ExtraPackages_GIT() {
-[ -d ./package/lean/$1 ] && rm -rf ./package/lean/$1
-while [ ! -f $1/Makefile ]
+ExtraPackages() {
+[ -d ./package/lean/$2 ] && rm -rf ./package/lean/$2
+[ -d ./$2 ] && rm -rf ./$2
+while [ ! -f $2/Makefile ]
 do
-	echo "Checking out $1 from $2 ..." > /dev/null 2>&1
-	git clone -b $3 $2/$1 $1
-	[ ! -f $1/Makefile ] && echo "Checkout failed,retry in 3s." && sleep 3
+	echo "Checking out $2 from $3 ..."
+	if [ $1 == git ];then
+		git clone -b $4 $3/$2 $2 > /dev/null 2>&1
+	else
+		svn checkout $3/$2 $2 > /dev/null 2>&1
+	fi
+	if [ ! -f $2/Makefile ];then
+		echo "Checkout failed,retry in 3s."
+		rm -rf $2 > /dev/null 2>&1
+		sleep 3
+	fi
 done
-echo "Package $1 detected!"
-mv $1 ./package/lean
-}
-
-ExtraPackages_SVN() {
-[ -d ./package/lean/$1 ] && rm -rf ./package/lean/$1
-while [ ! -f $1/Makefile ]
-do
-	echo "Checking out $1 from $2 ..."
-	svn checkout $2/$1 $1 > /dev/null 2>&1
-	[ ! -f $1/Makefile ] && echo "Checkout failed,retry in 3s." && sleep 3
-done
-echo "Package $1 detected!"
-mv $1 ./package/lean
+echo "Package $2 detected!"
+mv $2 ./package/lean
 }
 
 sed -i "s/#src-git helloworld/src-git helloworld/g" feeds.conf.default
-ExtraPackages_GIT luci-theme-argon https://github.com/jerrykuku 18.06
-ExtraPackages_SVN luci-app-openclash https://github.com/vernesong/OpenClash/trunk
-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 smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t
+ExtraPackages git luci-theme-argon https://github.com/jerrykuku 18.06
+ExtraPackages svn luci-app-openclash https://github.com/vernesong/OpenClash/trunk
+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 smartdns https://github.com/project-openwrt/openwrt/trunk/package/ntlf9t
 [ -d ./Openwrt-AutoUpdate ] && rm -rf ./Openwrt-AutoUpdate
-git clone $Github
+git clone -b master $AutoUpdate_Github
 mv Openwrt-AutoUpdate/AutoUpdate.sh ./package/base-files/files/bin