Update to v0.4.0

2 files changed, 14 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d13f0293b689..4930ad2780b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Oct 24 01:26:42 UTC 2018
+# Wed Nov  7 15:59:42 UTC 2018
 pkgbase = camouflage
 	pkgdesc = a mux+websocket+TLS proxy
-	pkgver = v0.3.0.r0.gf68c7e0
+	pkgver = v0.4.0
 	pkgrel = 1
 	url = https://github.com/Sherlock-Holo/camouflage
 	arch = x86_64
@@ -10,9 +10,9 @@ pkgbase = camouflage
 	makedepends = go
 	makedepends = git
 	backup = etc/camouflage/example.toml
-	source = camouflage::git://github.com/Sherlock-Holo/camouflage#branch=master
+	source = https://github.com/Sherlock-Holo/camouflage/archive/v0.4.0.tar.gz
 	source = camouflage.install
-	md5sums = SKIP
+	md5sums = e7b05cc3f5565c6b4c9c7e4dc31ae4d6
 	md5sums = d506ec62e984c89ddea0cec157292d42
 
 pkgname = camouflage
diff --git a/PKGBUILD b/PKGBUILD
index d3d1236e2b58..d4d34d674a9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sherlock Holo <sherlockya@gmail.com>
 pkgname=camouflage
-_pkgname=camouflage
-pkgver=v0.3.0.r0.gf68c7e0
+_pkgver=0.4.0
+pkgver=v${_pkgver}
 pkgrel=1
 pkgdesc="a mux+websocket+TLS proxy"
 arch=('x86_64')
@@ -10,60 +10,34 @@ depends=()
 makedepends=('go' 'git')
 url='https://github.com/Sherlock-Holo/camouflage'
 source=(
-	"$_pkgname::git://github.com/Sherlock-Holo/camouflage#branch=${BRANCH:-master}"
+	"https://github.com/Sherlock-Holo/camouflage/archive/$pkgver.tar.gz"
     "camouflage.install"
 )
 
-md5sums=('SKIP'
+md5sums=('e7b05cc3f5565c6b4c9c7e4dc31ae4d6'
          'd506ec62e984c89ddea0cec157292d42')
 
 backup=(
     'etc/camouflage/example.toml'
 )
 
-pkgver() {
-	if [[ "$PKGVER" ]]; then
-		echo "$PKGVER"
-		return
-	fi
-
-	cd "$srcdir/$_pkgname"
-	#local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
-	#local count=$(git rev-list --count HEAD)
-	#local commit=$(git rev-parse --short HEAD)
-	#echo "$date.${count}_$commit"
-    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 build() {
-	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"
 
 	mkdir -p "$srcdir/go/src"
 
 	export GOPATH="$srcdir/go"
 
-	mv "$srcdir/$_pkgname" "$srcdir/go/src/"
-
-	cd "$srcdir/go/src/$_pkgname/"
-	ln -sf "$srcdir/go/src/$_pkgname/" "$srcdir/$_pkgname"
-
-	echo ":: Updating git submodules"
-	git submodule update --init
+    tar -xvf $pkgver.tar.gz
+    cd "$srcdir/$pkgname-$_pkgver"
 
-	echo ":: Building binary"
+	msg2 "Building binary"
     export GO111MODULE=on
     export CGO_ENABLED=0
 	go get -v \
 		-gcflags "-trimpath $PWD:$GOPATH/src"
     
-    echo ":: Cleaning residual"
+    msg2 "Cleaning residual"
     chmod 777 -R $GOPATH/pkg/mod
     rm -rf $GOPATH/pkg/mod
 }
@@ -74,9 +48,9 @@ package() {
 	done
 
     mkdir -p $pkgdir/etc/camouflage
-    install -Dm644 $srcdir/go/src/camouflage/config/example.toml $pkgdir/etc/camouflage/
+    install -Dm644 $srcdir/$pkgname-$_pkgver/config/example.toml $pkgdir/etc/camouflage/
 
 	mkdir -p $pkgdir/usr/lib/systemd/system
-    install $srcdir/go/src/camouflage/systemd/camouflage-{client,server}@.service \
+    install $srcdir/$pkgname-$_pkgver/systemd/camouflage-{client,server}@.service \
     -Dm644 $pkgdir/usr/lib/systemd/system/
 }