[arch-commits] CVS update of arch/build/editors/vim (PKGBUILD vim.install)

[Tobias Kieslich]

    Date: Thursday, August 9, 2007 @ 15:10:21
  Author: tobias
    Path: /home/cvs-arch/arch/build/editors/vim

Modified: PKGBUILD (1.2 -> 1.3) vim.install (1.1 -> 1.2)

updated to new patchlevel (cvs only) and applied Abdrews changes


-------------+
 PKGBUILD    |    6 +++---
 vim.install |   27 ++++++++++++---------------
 2 files changed, 15 insertions(+), 18 deletions(-)


Index: arch/build/editors/vim/PKGBUILD
diff -u arch/build/editors/vim/PKGBUILD:1.2 arch/build/editors/vim/PKGBUILD:1.3
--- arch/build/editors/vim/PKGBUILD:1.2	Wed Aug  1 15:43:04 2007
+++ arch/build/editors/vim/PKGBUILD	Thu Aug  9 15:10:21 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.2 2007/08/01 19:43:04 tobias Exp $
+# $Id: PKGBUILD,v 1.3 2007/08/09 19:10:21 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vim
 _srcver=7.1
-_patchlevel=47
+_patchlevel=58
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor"
 arch=(i686 x86_64)
-license=(CUSTOUM)
+license=('custom:vim')
 url="http://www.vim.org"
 depends=('vi' 'perl' 'python' 'ruby' 'acl' 'gpm' 'libxt')
 makedepends=('wget' 'sed' 'grep')
Index: arch/build/editors/vim/vim.install
diff -u arch/build/editors/vim/vim.install:1.1 arch/build/editors/vim/vim.install:1.2
--- arch/build/editors/vim/vim.install:1.1	Mon Jul  9 20:26:30 2007
+++ arch/build/editors/vim/vim.install	Thu Aug  9 15:10:21 2007
@@ -1,30 +1,28 @@
 post_install() {
   # if we have an existing gvim installation - relocate binaries and symlinks
-  if [ -f /usr/bin/vim ] ; then
-    OLDDIR=$(pwd)
-    cd /usr/bin
+  if [ -f usr/bin/vim ] ; then
+    cd usr/bin
     rm -f view rview
     ln -s vim view
     ln -s vim rview
-    cd ${OLDDIR}
-    echo "create vim related symlinks..."
+    cd ${OLDPWD}
+    echo "Create vim related symlinks..."
   fi
   echo -n "Updating vim help tags..."
-  /usr/bin/vim --noplugins -u NONE -U NONE \
-    --cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
+  usr/bin/vim --noplugins -u NONE -U NONE \
+    --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
   echo "done."
 }
 
 pre_remove() {
-  OLDDIR=$(pwd)
-  cd /usr/bin
+  cd usr/bin
   rm -f view rview
-  if [ -f /usr/bin/vi ] ; then
+  if [ -f usr/bin/vi ] ; then
     ln -s vi view
     ln -s vi rview
-    echo "create vi related symlinks..."
+    echo "Create vi related symlinks..."
   fi
-  cd ${OLDDIR}
+  cd ${OLDPWD}
 }
 
 post_upgrade() {
@@ -32,10 +30,9 @@
 }
 
 pre_upgrade() {
-  pre_remove $1
+  pre_remove $2
 }
 
 op=$1
 shift
-
-$op $*
+[ "$(type -t "$op")" = "function" ] && $op "$@"