update version to 1.1.1, fix confilt between patch and source code

4 files changed, 21 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00c4b695d91e..6b630795add2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hustmirror-cli
 	pkgdesc = The command line tool (hustmirror-cli) is a small tool that can help you quickly change sources to HUST mirror sources.
-	pkgver = 1.0.2
+	pkgver = 1.1.1
 	pkgrel = 1
 	url = https://gitee.com/hustmirror/hustmirror-cli
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = hustmirror-cli
 	source = hustmirror-cli-stable.patch
 	source = hustmirror-cli-makefile.patch
 	sha256sums = SKIP
-	sha256sums = b282b2527d8463bc891e84413d3a672e3d6c3bada277f26b7056fe814bf9c5e4
-	sha256sums = SKIP
+	sha256sums = a08dfc1246edcb721505d717dff36abdaa4aee0f1a74c02d4eece69f563cb5e8
+	sha256sums = b63df2685509bbdd82a97c0b73e4891d013a6a91c19fc029ed79ce9fc35b4710
 
 pkgname = hustmirror-cli
diff --git a/PKGBUILD b/PKGBUILD
index 404a9ed9991c..974bd86b03bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer:TurtleRuss <tttturtleruss@gmail.com> 
 pkgname=hustmirror-cli
-pkgver=1.0.2
+pkgver=1.1.1
 pkgrel=1
 epoch=
 pkgdesc="The command line tool (hustmirror-cli) is a small tool that can help you quickly change sources to HUST mirror sources."
@@ -21,11 +21,11 @@ install=
 changelog=
 source=("$pkgname-stable.tar.gz::${url}/repository/archive/stable.tar.gz"
         "$pkgname-stable.patch"
-	"$pkgname-makefile.patch")
+		"$pkgname-makefile.patch")
 noextract=()
 sha256sums=('SKIP'
-            'b282b2527d8463bc891e84413d3a672e3d6c3bada277f26b7056fe814bf9c5e4'
-	    'SKIP')
+            'a08dfc1246edcb721505d717dff36abdaa4aee0f1a74c02d4eece69f563cb5e8'
+			'b63df2685509bbdd82a97c0b73e4891d013a6a91c19fc029ed79ce9fc35b4710')
 validpgpkeys=()
 
 prepare() {
@@ -43,5 +43,6 @@ build() {
 
 package() {
 	cd "$pkgname-stable"
+	echo $pkgdir
 	make DESTDIR="$pkgdir/" install
 }
diff --git a/hustmirror-cli-makefile.patch b/hustmirror-cli-makefile.patch
index b329df03da9f..4445df5245ae 100644
--- a/hustmirror-cli-makefile.patch
+++ b/hustmirror-cli-makefile.patch
@@ -1,50 +1,26 @@
-From be03a68c6e9bafdce5220d772fc543bc6902f599 Mon Sep 17 00:00:00 2001
+From aad5ae8fbd2abd769e75cf77f826978dd50b11b6 Mon Sep 17 00:00:00 2001
 From: TurtleRuss <tttturtleruss@gmail.com>
-Date: Sun, 25 Feb 2024 18:38:30 +0800
-Subject: [PATCH] s
+Date: Thu, 21 Mar 2024 09:49:31 +0800
+Subject: [PATCH] patch makefile
 
 ---
- Makefile                      |  4 ++++
- hustmirror-cli-makefile.patch | 15 +++++++++++++++
- 2 files changed, 19 insertions(+)
- create mode 100644 hustmirror-cli-makefile.patch
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index fe7b8fb..59699cd 100644
+index a473d64..1c1c255 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -18,6 +18,10 @@ all: $(OUT_FILE)
- test: $(OUT_FILE)
+@@ -20,7 +20,8 @@ test: $(OUT_FILE)
  	@tests/test.sh
  
-+install: $(OUT_FILE)
-+	@mkdir -p $(DESTDIR)usr/local/bin
-+	@cp $(OUT_FILE) $(DESTDIR)usr/local/bin
-+
+ install: $(OUT_FILE)
+-	@cp $(OUT_FILE) $(INSTALL_DIR)
++	@mkdir -p $(DESTDIR)usr/local/bin/
++	@cp $(OUT_FILE) $(DESTDIR)usr/local/bin/
+ 
  $(OUT_FILE): $(TEMPLATE_FILE) $(OUT_MIRROR_FILES) $(INCLUDE_FILES) $(OTHER_FILES)
  	@mkdir -p $(OUT_DIR)
- 	@echo "Process $<"
-diff --git a/hustmirror-cli-makefile.patch b/hustmirror-cli-makefile.patch
-new file mode 100644
-index 0000000..ddfccba
---- /dev/null
-+++ b/hustmirror-cli-makefile.patch
-@@ -0,0 +1,15 @@
-+diff --git a/Makefile b/Makefile
-+index fe7b8fb..59699cd 100644
-+--- a/Makefile
-++++ b/Makefile
-+@@ -18,6 +18,10 @@ all: $(OUT_FILE)
-+ test: $(OUT_FILE)
-+ 	@tests/test.sh
-+ 
-++install: $(OUT_FILE)
-++	@mkdir -p $(DESTDIR)usr/local/bin
-++	@cp $(OUT_FILE) $(DESTDIR)usr/local/bin
-++
-+ $(OUT_FILE): $(TEMPLATE_FILE) $(OUT_MIRROR_FILES) $(INCLUDE_FILES) $(OTHER_FILES)
-+ 	@mkdir -p $(OUT_DIR)
-+ 	@echo "Process $<"
 -- 
 2.44.0
 
diff --git a/hustmirror-cli-stable.patch b/hustmirror-cli-stable.patch
index 97c5d7b6368f..400e2074a6a1 100644
--- a/hustmirror-cli-stable.patch
+++ b/hustmirror-cli-stable.patch
@@ -4,28 +4,8 @@ Date: Sun, 17 Dec 2023 14:24:41 +0800
 Subject: [PATCH] patch:core/install
 
 ---
- Makefile    |  4 ++++
  src/core.sh | 25 +------------------------
- 2 files changed, 5 insertions(+), 24 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fe7b8fb..6414dc9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,10 +11,14 @@ OUT_DIR := output
- OUT_FILE := $(OUT_DIR)/hustmirror-cli
- OUT_MIRROR_DIR := $(OUT_DIR)/mirrors
- OUT_MIRROR_FILES := $(patsubst $(MIRROR_DIR)/%,$(OUT_MIRROR_DIR)/%,$(MIRROR_FILES))
-+INSTALL_DIR := /usr/local/bin/
- 
- all: $(OUT_FILE)
- 	@echo "Done, object script is $(OUT_FILE)."
- 
-+install: $(OUT_FILE)
-+	@cp $(OUT_FILE) $(INSTALL_DIR)
-+
- test: $(OUT_FILE)
- 	@tests/test.sh
+ 1 files changed, 5 insertions(+), 24 deletions(-)
  
 diff --git a/src/core.sh b/src/core.sh
 index 91a0796..9975e15 100644