[arch-commits] Commit in zsh/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Friday, September 13, 2013 @ 15:52:38
  Author: pierre
Revision: 194327

Remove systemd completion and update fpath

* FS#36476 - systemd zsh completion: use systemd's own files 
* FS#34994 - [zsh] Fix default fpath

Modified:
  zsh/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-13 11:45:42 UTC (rev 194326)
+++ PKGBUILD	2013-09-13 13:52:38 UTC (rev 194327)
@@ -3,7 +3,7 @@
 
 pkgname=zsh
 pkgver=5.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -16,7 +16,7 @@
 md5sums=('b8f2ad691acf58b3252225746480dcad'
          '24a9335edf77252a7b5f52e079f7aef7')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	# Set correct keymap path
@@ -23,10 +23,17 @@
 	sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
 
 	# Remove unneeded and conflicting completion scripts
-	rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
+	for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do
+		rm -rf Completion/$_fpath
+		sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
+	done
 	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
-	rm -f  Completion/Unix/Command/_osc
+	rm -f  Completion/Unix/Command/_{osc,systemd}
+}
 
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	./configure --prefix=/usr \
 		--enable-etcdir=/etc/zsh \
 		--enable-zshenv=/etc/zsh/zshenv \