Standarization of PKGBUILD

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62822a1361e7..43cb1faaa1ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = asbru-cm-git
-	pkgdesc = A free and open-source connection manager. GIT version
-	pkgver = 6.0.3.r1.gb57bb49
+	pkgdesc = A free and open-source connection manager. depelopment branch. GIT version
+	pkgver = 6.0.3.r5.gc9e912b
 	pkgrel = 1
 	url = https://github.com/asbru-cm/asbru-cm
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 6c67d760d9e6..af02bc910d23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Joan Figueras <ffigue at gmail dot com>
 # Contributor: Luca Contini <jkd[dot]luca[at]gmail[dot]com>
 
-pkgname=asbru-cm-git
-_pkgname=${pkgname%-git}
-pkgver=6.0.3.r1.gb57bb49
+branch= # master
+pkgname=asbru-cm${branch}-git
+_pkgname=asbru
+_fpkgname=asbru-cm
+pkgver=6.0.3.r5.gc9e912b
 pkgrel=1
 arch=('any')
 license=('GPL3')
-pkgdesc="A free and open-source connection manager. GIT version"
+pkgdesc="A free and open-source connection manager. ${branch} depelopment branch. GIT version"
 url="https://github.com/asbru-cm/asbru-cm"
 depends=('perl' 'vte3' 'cairo-perl' 'glib-perl' 'pango-perl' 'perl-socket6' 'perl-expect' 'perl-yaml' 'perl-crypt-cbc' 'perl-crypt-blowfish' 'perl-gtk3' 'perl-net-arp' 'uuid' 'openssh' 'inetutils' 'perl-crypt-rijndael' 'perl-xml-parser' 'libcanberra' 'perl-gtk3-simplelist' 'libwnck3' 'perl-io-stty' 'perl-io-tty')
 optdepends=('uucp: Unix-to-Unix Copy' 'rdesktop: RDP connections' 'freerdp: RDP connections' 'openssh: SSH connections' 'mosh: Mobile shell' 'tigervnc: for VNC connections'
@@ -18,21 +20,21 @@ source=("git+https://github.com/asbru-cm/asbru-cm.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_pkgname"
+  cd "${_fpkgname}"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-	cd ${srcdir}/${_pkgname}
-	mkdir -p $pkgdir/{opt/asbru,usr/share/pixmaps,usr/share/man/man1,usr/share/applications,usr/bin,etc/bash_completion.d}
-	cp -rp res utils lib $pkgdir/opt/asbru/
-	cp -p res/asbru_bash_completion $pkgdir/etc/bash_completion.d/asbru_bash_completion
-	cp res/asbru-logo-64.png $pkgdir/usr/share/pixmaps/${_pkgname}.png
-	cp res/${_pkgname}.desktop $pkgdir/usr/share/applications/
-	gzip -c res/${_pkgname}.1 > $pkgdir/usr/share/man/man1/${_pkgname}.1.gz
-	cp -p ${_pkgname} $pkgdir/opt/asbru/${_pkgname}
-	chmod 755 $pkgdir/opt/asbru/${_pkgname}
-	ln -sf /opt/asbru/${_pkgname} $pkgdir/usr/bin/${_pkgname}
+	cd "${_fpkgname}"
+	mkdir -p $pkgdir/{opt/${_pkgname}${branch},usr/share/pixmaps,usr/share/man/man1,usr/share/applications,usr/bin,etc/bash_completion.d}
+	cp -rp res utils lib $pkgdir/opt/${_pkgname}${branch}/
+	cp -p res/${_pkgname}_bash_completion $pkgdir/etc/bash_completion.d/${_pkgname}${branch}_bash_completion
+	cp res/${_pkgname}-logo-64.png $pkgdir/usr/share/pixmaps/${_pkgname}${branch}.png
+	cp res/${_fpkgname}.desktop $pkgdir/usr/share/applications/${_pkgname}${branch}.desktop
+	gzip -c res/${_fpkgname}.1 > $pkgdir/usr/share/man/man1/${_pkgname}${branch}.1.gz
+	cp -p ${_fpkgname} $pkgdir/opt/${_pkgname}${branch}/${_pkgname}${branch}
+	chmod 755 $pkgdir/opt/${_pkgname}${branch}/${_pkgname}${branch}
+	ln -sf /opt/${_pkgname}${branch}/${_pkgname}${branch} $pkgdir/usr/bin/${_pkgname}${branch}
 }