Standarization of PKGBUILD

3 files changed, 30 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea4db5b4a843..b82626d158c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = asbru-cm-loki-git
-	pkgdesc = A free and open-source connection manager. loki depelopment branch. GIT version
-	pkgver = 6.1.0
+	pkgdesc = A free and open-source connection manager. -loki depelopment branch. GIT version
+	pkgver = 6.0.3.r58.ge288016
 	pkgrel = 1
 	url = https://github.com/asbru-cm/asbru-cm
 	arch = any
@@ -36,9 +36,7 @@ pkgbase = asbru-cm-loki-git
 	optdepends = tigervnc: for VNC connections
 	optdepends = perl-x11-guitest: To fit perfectly RDP tabs
 	source = git+https://github.com/asbru-cm/asbru-cm.git#branch=loki
-	source = asbru-cm-loki.desktop
 	sha256sums = SKIP
-	sha256sums = 6c22432e241f0743f8ac294b7623cbce5a41b0a8c859677853450e5451dc3d99
 
 pkgname = asbru-cm-loki-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 053075d83222..2c79850e192d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,45 @@
 # Maintainer: Joan Figueras <ffigue at gmail dot com>
 # Contributor: Luca Contini <jkd[dot]luca[at]gmail[dot]com>
 
-pkgname=asbru-cm-loki-git
-_pkgname=${pkgname%-loki-git}
-pkgver=6.1.0
+branch=-loki # development branch
+pkgname=asbru-cm${branch}-git
+_pkgname=asbru
+_fpkgname=asbru-cm
+pkgver=6.0.3.r58.ge288016
 pkgrel=1
 arch=('any')
 license=('GPL3')
-pkgdesc="A free and open-source connection manager. loki depelopment branch. 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'
 	    'perl-x11-guitest: To fit perfectly RDP tabs')
 makedepends=('git')
 #conflicts=()
-source=("git+https://github.com/asbru-cm/asbru-cm.git#branch=loki" asbru-cm-loki.desktop)
-sha256sums=('SKIP'
-            '6c22432e241f0743f8ac294b7623cbce5a41b0a8c859677853450e5451dc3d99')
+source=("git+https://github.com/asbru-cm/asbru-cm.git#branch=${branch#-}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${_fpkgname}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+        cd "${_fpkgname}"
+        sed -e "s/${_fpkgname}/${_fpkgname}-$branch/g" -e "s/Name=Ásbrú.*/& ($branch)/g" -i res/${_fpkgname}.desktop
+}
 
 package() {
-	cd ${srcdir}/${_pkgname}
-	mkdir -p $pkgdir/{opt/asbru-loki,usr/share/pixmaps,usr/share/man/man1,usr/share/applications,usr/bin,etc/bash_completion.d}
-	cp -rp res utils lib $pkgdir/opt/asbru-loki/
-	cp -p res/asbru_bash_completion $pkgdir/etc/bash_completion.d/asbru_loki_bash_completion
-	cp res/asbru-logo-64.png $pkgdir/usr/share/pixmaps/${_pkgname}-loki.png
-	cp ${srcdir}/asbru-cm-loki.desktop $pkgdir/usr/share/applications/
-	gzip -c res/${_pkgname}.1 > $pkgdir/usr/share/man/man1/${_pkgname}-loki.1.gz
-	cp -p ${_pkgname} $pkgdir/opt/asbru-loki/${_pkgname}
-	chmod 755 $pkgdir/opt/asbru-loki/${_pkgname}
-	ln -sf /opt/asbru-loki/${_pkgname} $pkgdir/usr/bin/${_pkgname}-loki
+	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}
 }
 
 
diff --git a/asbru-cm-loki.desktop b/asbru-cm-loki.desktop
deleted file mode 100644
index 8b6456242cdf..000000000000
--- a/asbru-cm-loki.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Name=Ásbrú Connection Manager (Loki)
-Comment=Ásbrú Connection Manager is a user interface that helps organizing remote terminal sessions and automating repetitive tasks.
-Terminal=false
-Icon=asbru-cm-loki
-Type=Application
-Exec=asbru-cm-loki
-StartupNotify=true
-Categories=Utility;TerminalEmulator;GTK;
-X-GNOME-Autostart-enabled=false
-Actions=Shell;Quick;ReadOnly;Tray;
-
-[Desktop Action Shell]
-Name=Start local shell
-Exec=asbru-cm-loki --start-shell
-
-[Desktop Action Quick]
-Name=Quick connect...
-Exec=asbru-cm-loki --quick-conn
-
-[Desktop Action ReadOnly]
-Name=Start Read-Only instance
-Exec=asbru-cm-loki --readonly --no-backup
-
-[Desktop Action Tray]
-Name=Start in system tray
-Exec=asbru-cm-loki --iconified