v1.0.5+6

2 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66ff3a358443..72f43335195d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = go-drcom-jlu-git
 	pkgdesc = JLU drcom client written in golang.
-	pkgver = 1.0.4
-	pkgrel = 5
+	pkgver = 1.0.5
+	pkgrel = 6
 	url = https://github.com/Yesterday17/go-drcom-jlu
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 03567d4a340c..94bb239d368c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Yesterday17 <t@yesterday17.cn>
 pkgname=go-drcom-jlu-git
 _pkgname=go-drcom-jlu
-pkgver=1.0.4
-pkgrel=5
+pkgver=1.0.5
+pkgrel=6
 pkgdesc="JLU drcom client written in golang."
 arch=('i686' 'x86_64')
 url="https://github.com/Yesterday17/go-drcom-jlu"
@@ -21,33 +21,28 @@ md5sums=('SKIP')
 
 build() {
     export GO111MODULE=on
-	cd "$srcdir/$_pkgname"
 
 	if [ -L "$srcdir/$_pkgname" ]; then
 		rm "$srcdir/$_pkgname" -rf
 		mv "$srcdir/go/src/$_pkgname/" "$srcdir/$_pkgname"
 	fi
 
-	rm -rf "$srcdir/go/src"
+	rm -rf "go/src"
 
-	mkdir -p "$srcdir/go/src"
+	mkdir -p "go/src"
 
-	mv "$srcdir/$_pkgname" "$srcdir/go/src/"
+	mv "$_pkgname" "go/src/"
 
-	cd "$srcdir/go/src/$_pkgname/"
-	ln -sf "$srcdir/go/src/$_pkgname/" "$srcdir/$_pkgname"
+	ln -sf "go/src/$_pkgname/" "$_pkgname"
+	cd "go/src/${_pkgname}/"
 
 	echo ":: Building binary"
 	go build
 }
 
 package() {
-    install -m755 -d $pkgdir/usr/bin/
-    install -m644 $srcdir/$_pkgname/$_pkgname $pkgdir/usr/bin/$_pkgname
-	chmod +x $pkgdir/usr/bin/$_pkgname
-    
-    install -m755 -d ${pkgdir}/etc/go-drcom-jlu/
-    install -m644  $srcdir/$_pkgname/release/config.json ${pkgdir}/etc/go-drcom-jlu/
-    install -m755 -d ${pkgdir}/usr/lib/systemd/system
-    install -m644  $srcdir/$_pkgname/release/go-drcom-jlu.service ${pkgdir}/usr/lib/systemd/system
+    cd "${_pkgname}"
+    install -Dm755 ${_pkgname} "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm644 release/config.json -t "${pkgdir}/etc/go-drcom-jlu/"
+    install -Dm644 release/go-drcom-jlu.service -t "${pkgdir}/usr/lib/systemd/system"
 }