[arch-commits] CVS update of arch/build/base/vi (PKGBUILD vi.install)

[Tobias Kieslich]

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

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

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


------------+
 PKGBUILD   |    8 ++++----
 vi.install |   24 +++++++++++-------------
 2 files changed, 15 insertions(+), 17 deletions(-)


Index: arch/build/base/vi/PKGBUILD
diff -u arch/build/base/vi/PKGBUILD:1.2 arch/build/base/vi/PKGBUILD:1.3
--- arch/build/base/vi/PKGBUILD:1.2	Wed Aug  1 15:43:04 2007
+++ arch/build/base/vi/PKGBUILD	Thu Aug  9 15:10:20 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:20 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
 _srcver=7.1
-_patchlevel=47
+_patchlevel=58
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor (basic version)"
 arch=(i686 x86_64)
-license=(CUSTOUM)
+license=('custom:vim')
 url="http://www.vim.org"
 depends=('glibc' 'ncurses')
 makedepends=('wget' 'sed' 'grep')
@@ -59,5 +59,5 @@
   rm -f ${startdir}/pkg/usr/share/vim/gvimrc_example.vim
   install -dm755 ${startdir}/pkg/usr/share/licenses/vim
   cd ${startdir}/pkg/usr/share/licenses/vim
-  ln -s ../../vim/doc/uganda.txt LICENSE
+  ln -s ../../vim/doc/uganda.txt license.txt
 }
Index: arch/build/base/vi/vi.install
diff -u arch/build/base/vi/vi.install:1.1 arch/build/base/vi/vi.install:1.2
--- arch/build/base/vi/vi.install:1.1	Mon Jul  9 20:26:29 2007
+++ arch/build/base/vi/vi.install	Thu Aug  9 15:10:20 2007
@@ -1,16 +1,15 @@
 post_install() {
   # if we have vim installed create view/rview symlinks to vim
-  if [ ! -f /usr/bin/vim ] ; then
-    OLDDIR=$(pwd)
-    cd /usr/bin
+  if [ ! -f usr/bin/vim ] ; then
+    cd usr/bin
     ln -s vi view
     ln -s vi rview
-    cd ${OLDDIR}
-    echo "create vi relate symlinks..."
+    cd ${OLDPWD}
+    echo "Create vi relate symlinks..."
   fi
   echo -n "Updating vi help tags..."
-  /usr/bin/vi --noplugins -u NONE -U NONE \
-    --cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
+  usr/bin/vi --noplugins -u NONE -U NONE \
+    --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
   echo "done."
 }
 
@@ -18,9 +17,9 @@
   # if vi is a binary instead of a symlink we have an intact gvim installation
   # with a different binary/symlink structure
   # we recover what pacmans database knows about Vim
-  if [ ! -f /usr/bin/vim ] ; then
-    rm -f /usr/bin/view /usr/bin/rview
-    echo "remove  vi related symlinks ..."
+  if [ ! -f usr/bin/vim ] ; then
+    rm -f usr/bin/view usr/bin/rview
+    echo "Remove vi related symlinks ..."
   fi
 }
 
@@ -29,11 +28,10 @@
 }
 
 pre_upgrade() {
-  pre_remove $1
+  pre_remove $2
 }
 
 
 op=$1
 shift
-
-$op $*
+[ "$(type -t "$op")" = "function" ] && $op "$@"