dero v2.1.6-1

Signed-off-by: c.magyar <c.magyar.ec@gmail.com>

2 files changed, 23 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb5c9d6aa604..57b736ca10db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = dero
 	pkgdesc = Dero: cryptonote currency daemon and wallet
-	pkgver = 2.1.5
+	pkgver = 2.1.6
 	pkgrel = 1
 	url = https://github.com/deroproject/derosuite
 	arch = x86_64
 	license = custom:Research
 	makedepends = go
 	depends = glibc
-	source = https://github.com/deroproject/derosuite/archive/v2.1.5.tar.gz
-    md5sums = 21c3c5961de71e2901bf85d77db4c768
+	source = https://github.com/deroproject/derosuite/archive/v2.1.6-1.tar.gz
+    md5sums = 4250f4673704d3417c8deef73373f410
 pkgname = dero
diff --git a/PKGBUILD b/PKGBUILD
index bd3b521a8a89..1fd951871508 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,22 @@
 # Maintainer: Chris Magyar <c.magyar.ec@gmail.com>
 
 pkgname=dero
-pkgver=2.1.5
-_gituser=deroproject
-_gitrepo=derosuite
-_gitver=v2.1.5
+pkgver=2.1.6
 pkgrel=1
+_gitrepo=derosuite
+_gituser=deroproject
+_gitver=v2.1.6-1
 pkgdesc='Dero: cryptonote currency daemon and wallet'
-arch=( 'x86_64' )
+arch=('x86_64')
 url="https://github.com/$_gituser/$_gitrepo"
-license=( 'custom:Research' )
-makedepends=( 'go' )
-depends=( 'glibc' )
+license=('custom:Research')
+makedepends=('go')
+depends=('glibc')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$_gitver.tar.gz")
-md5sums=('21c3c5961de71e2901bf85d77db4c768')
+md5sums=('4250f4673704d3417c8deef73373f410')
 
 prepare() {
-    # set source folder name:
-    if [ ! -d "$srcdir/$pkgname-$pkgver" ]; then
-        if [ -d "$srcdir/$_gitrepo-$_gitver" ]; then
-            mv "$srcdir/$_gitrepo-$_gitver" "$srcdir/$pkgname-$pkgver"
-        elif [ -d "$srcdir/$_gitrepo-$pkgver" ]; then
-            mv "$srcdir/$_gitrepo-$pkgver" "$srcdir/$pkgname-$pkgver"
-        elif [ -d "$srcdir/$pkgname-$_gitver" ]; then
-            mv "$srcdir/$pkgname-$_gitver" "$srcdir/$pkgname-$pkgver"
-        fi
-    fi
-	cd "$srcdir/$pkgname-$pkgver"
+    mv derosuite-2.1.6-1 "$pkgname-$pkgver"
 }
 
 build() {
@@ -35,30 +25,24 @@ build() {
     export DEROSUITE="$GOPATH/src/github.com/deroproject/derosuite"
     mkdir -p "$GOBIN"
     mkdir -p "$GOPATH/src/github.com/deroproject/"
-    mv "$srcdir/$pkgname-$pkgver" "$DEROSUITE"
-    cd "$DEROSUITE/cmd"
-    cd derod
-    printf "\e[1;34m  ->\e[1;37m go build derod..."
-    printf "\e[0;38;5;15m\n"
+    mv "$pkgname-$pkgver" "$DEROSUITE"
+    cd "$DEROSUITE/cmd/derod"
+    printf "\e[1;34m  ->\e[1;37m go build derod...\e[0;37m\n"
 	go build -v
     cd ../dero-wallet-cli
-    printf "\e[1;34m  ->\e[1;37m go build dero-wallet-cli..."
-    printf "\e[0;38;5;15m\n"
+    printf "\e[1;34m  ->\e[1;37m go build dero-wallet-cli...\e[0;37m\n"
     go build -v
     cd ../explorer
-    printf "\e[1;34m  ->\e[1;37m go build dero-explorer..."
-    printf "\e[0;38;5;15m\n"
+    printf "\e[1;34m  ->\e[1;37m go build dero-explorer...\e[0;37m\n"
     go build -v
 }
 
 package() {
 	cd "$DEROSUITE"
-    install -Dm755 "cmd/derod/derod" \
-		"$pkgdir/usr/bin/derod"
-    install -Dm755 "cmd/dero-wallet-cli/dero-wallet-cli" \
+    install -Dm755 ./cmd/derod/derod "$pkgdir/usr/bin/derod"
+    install -Dm755 ./cmd/dero-wallet-cli/dero-wallet-cli \
 		"$pkgdir/usr/bin/dero-wallet-cli"
-    install -Dm755 "cmd/explorer/explorer" \
-		"$pkgdir/usr/bin/dero-explorer"
-    install -Dm644 LICENSE \
-		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm755 ./cmd/explorer/explorer \
+        "$pkgdir/usr/bin/dero-explorer"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }