switch back to VCS git workflow

instead of master.zip

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 786f00593804..ce6770f32d8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nightcode-git
 	pkgdesc = A Editor/IDE described as "The only thing you need to create Clojure and Java projects"
-	pkgver = 2.0.1
+	pkgver = 2.0.1.r6.g5340984
 	pkgrel = 1
 	url = https://sekao.net/nightcode/
 	arch = any
@@ -9,7 +9,7 @@ pkgbase = nightcode-git
 	depends = java-runtime>7
 	depends = java-openjfx
 	noextract = boot.sh
-	source = https://github.com/oakes/nightcode/archive/master.zip
+	source = nightcode-git::git+http://github.com/oakes/Nightcode.git
 	source = https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f821ffd79960..beb9c6efda78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=nightcode-git
 
-pkgver=2.0.1
+pkgver=2.0.1.r6.g5340984
 pkgrel=1
 pkgdesc='A Editor/IDE described as "The only thing you need to create Clojure and Java projects"'
 arch=('any')
@@ -11,34 +11,32 @@ license=('custom')
 depends=('bash' 'java-runtime>7' 'java-openjfx')
 
 pkgver() {
-  cd $srcdir/Nightcode-master
-  bash $startdir/boot.sh pom
-  cat target/META-INF/maven/nightcode/nightcode/pom.properties | grep version | cut -d= -f2
+  cd "$pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-source=('https://github.com/oakes/nightcode/archive/master.zip'
+source=('nightcode-git::git+http://github.com/oakes/Nightcode.git'
         'https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh')
 
 md5sums=('SKIP' 'SKIP')
-
 noextract=('boot.sh')
 
 build() {
-  cd $srcdir/Nightcode-master
+  cd $srcdir/$pkgname
   msg2 "compiling and building uberjar - this may take some time"
-  bash $startdir/boot.sh build
+  bash $srcdir/../boot.sh build
 }
 
 package() {
-  JARNAME="nightcode-"$pkgver"-standalone.jar"
+  JARNAME="nightcode-standalone.jar"
 
   #artifact
   mkdir -p "$pkgdir/usr/share/java/nightcode-git/"
-  cp $srcdir/Nightcode-master/target/project.jar "$pkgdir/usr/share/java/nightcode-git/$JARNAME"
+  cp $srcdir/$pkgname/target/project.jar "$pkgdir/usr/share/java/$pkgname/$JARNAME"
   
   #license
   mkdir -p "$pkgdir/usr/share/licenses/nightcode-git/"
-  cp $srcdir/Nightcode-master/UNLICENSE "$pkgdir/usr/share/licenses/nightcode-git/"
+  cp $srcdir/$pkgname/UNLICENSE "$pkgdir/usr/share/licenses/$pkgname/"
   
   #launcher
   mkdir -p "$pkgdir/usr/bin/"