Quoting variables and stuff

Signed-off-by: Dan Printzell <xwildn00bx@gmail.com>

2 files changed, 28 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 545d61c30e70..808155efad1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 # Generated by mksrcinfo v8
-# Tue Jun 21 14:00:30 UTC 2016
+# Mon Jul 24 01:46:25 UTC 2017
 pkgbase = dub-git
 	pkgdesc = Package manager for D packages, git version
-	pkgver = 1.0.0.r0.b59af2b
+	pkgver = 1.4.0.rc.1.r46.46a74e2
 	pkgrel = 1
 	url = https://github.com/D-Programming-Language/dub
 	arch = i686
 	arch = x86_64
+	groups = dlang
 	license = MIT
 	makedepends = git
 	makedepends = dmd
diff --git a/PKGBUILD b/PKGBUILD
index 70b19295d59f..57f73db294f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,47 @@
-# Maintainer: Davi da Silva Böger <dsboger at gmail dot com>
+# Maintainer: Dan Printzell <arch@vild.io>
+# Contributor: Davi da Silva Böger <dsboger at gmail dot com>
 # Contributor: Moritz Maxeiner <moritz@ucworks.org>
 
-pkgname=dub-git
-_gitname=dub
-pkgver=1.0.0.r0.b59af2b
+pkgname=('dub-git')
+pkgver=1.4.0.rc.1.r46.46a74e2
 pkgrel=1
 pkgdesc="Package manager for D packages, git version"
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-Language/dub"
 license=('MIT')
+groups=('dlang')
 depends=('curl')
 makedepends=('git' 'dmd')
 provides=('dub')
 conflicts=('dub')
+
 source=('git+https://github.com/D-Programming-Language/dub')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd ${srcdir}/${_gitname}
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
+	cd "$srcdir/dub"
+	git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
 build() {
-  cd ${srcdir}/${_gitname}
-  ./build.sh
+  DC=dmd
+	cd "$srcdir/dub"
+
+  echo Generating version file...
+  GITVER=${pkgver}
+  echo "module dub.version_;" > source/dub/version_.d
+  echo "enum dubVersion = \"$GITVER\";" >> source/dub/version_.d
+
+  $DC -ofbin/dub -w -O -g -version=DubUseCurl -Isource -L-lcurl @build-files.txt
 }
 
 package() {
-  cd ${srcdir}/${_gitname}
-  install -D -m755 bin/dub "${pkgdir}/usr/bin/dub"
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+	# binaries
+	install -Dm755 "$srcdir/dub/bin/dub" "$pkgdir/usr/bin/dub"
+
+	# license
+	install -Dm644 "$srcdir/dub/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+	# bash completion
+	install -Dm644 "$srcdir/dub/scripts/bash-completion/dub.bash" "$pkgdir/usr/share/bash-completion/completions/dub"
 }