[pacman-dev] FS7228: Update {PKGBUILD,install}.proto

Sebastian Nowicki xilonmu at gmail.com
Tue Jun 5 11:22:45 EDT 2007


Wouldn't it be better to quote the whole string? Having just $startdir in
quotes looks really strange.

eg:
    cd "$startdir/src/$pkgname-$pkgver"

On Tue, Jun 05, 2007 at 02:23:11PM +0100, Andrew Fyfe wrote:
>  Attached is a patch to update {PKGBUILD,install}.proto
>  	- Add group and options field
>  	- Quote $startdir
>  	- Add vim modeline
>  	- Add check to see if function exists in install.proto
>  	  before trying to call it, avoids the annoying bash
>  	  error if the function is missing.
> 
>  Andrew

> --- PKGBUILD.proto.orig	2007-03-02 20:42:07.000000000 +0000
> +++ PKGBUILD.proto	2007-06-05 14:11:56.000000000 +0100
> @@ -11,6 +11,7 @@
>  arch=()
>  url=""
>  license=('GPL')
> +groups=()
>  depends=()
>  makedepends=()
>  provides=()
> @@ -18,13 +19,17 @@
>  replaces=()
>  backup=()
>  install=
> +options=()
>  source=($pkgname-$pkgver.tar.gz)
>  noextract=()
> -md5sums=(generate with makepkg -g)
> +md5sums=() # generate with 'makepkg -g'
>  
>  build() {
> -  cd $startdir/src/$pkgname-$pkgver
> +  cd "$startdir"/src/$pkgname-$pkgver
> +
>    ./configure --prefix=/usr
>    make || return 1
> -  make DESTDIR=$startdir/pkg install
> +  make DESTDIR="$startdir"/pkg install
>  }
> +
> +# vim:set ts=2 sw=2 et:
> --- install.proto.orig	2004-11-03 01:14:37.000000000 +0000
> +++ install.proto	2007-06-05 14:11:47.000000000 +0100
> @@ -35,4 +35,6 @@
>  
>  op=$1
>  shift
> -$op $*
> +[ "$(type -t "$op")" = "function" ] && "$op" "$@"
> +
> +# vim:set ts=2 sw=2 et:

> _______________________________________________
> pacman-dev mailing list
> pacman-dev at archlinux.org
> http://archlinux.org/mailman/listinfo/pacman-dev





More information about the pacman-dev mailing list