On 08/04/13 10:44, Jason St. John wrote: > From: "Jason St. John" <[email protected]> > > Many instances in the prototypes did not contain quotes where variables > would be expanded or in arrays (e.g. 'depends=(ruby)'). This commit adds > quotes in all identified areas as appropriate. > > This commit also removes the hard-coded path to gconfpkg in > proto-gnome.install and removes the legacy '|| return 0' in > proto-info.install.
That is not legacy but entirely necessary... > > Signed-off-by: Jason St. John <[email protected]> > --- > prototypes/PKGBUILD-gnome.proto | 8 ++++---- > prototypes/PKGBUILD-haskell.proto | 8 ++++---- > prototypes/PKGBUILD-perl.proto | 2 +- > prototypes/PKGBUILD-python.proto | 4 ++-- > prototypes/PKGBUILD-rubygem.proto | 14 +++++++------- > prototypes/proto-gnome.install | 4 ++-- > prototypes/proto-info.install | 4 ++-- > 7 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/prototypes/PKGBUILD-gnome.proto b/prototypes/PKGBUILD-gnome.proto > index bfffdab..5feae14 100644 > --- a/prototypes/PKGBUILD-gnome.proto > +++ b/prototypes/PKGBUILD-gnome.proto > @@ -3,8 +3,8 @@ > # NOTE: Please fill out the license field for your package! If it is unknown, > # then please put 'unknown'. > > -# See http://wiki.archlinux.org/index.php/Gnome_package_guidelines for more > -# information on Gnome packaging. > +# See https://wiki.archlinux.org/index.php/GNOME_Package_Guidelines for more > +# information on GNOME packaging. > > # Maintainer: Your Name <[email protected]> > pkgname=NAME > @@ -22,8 +22,8 @@ conflicts=() > replaces=() > backup=() > options=() > -install=$pkgname.install > -source=($pkgname-$pkgver.tar.gz) > +install="$pkgname.install" > +source=("$pkgname-$pkgver.tar.gz") > noextract=() > md5sums=() #generate with 'makepkg -g' > > diff --git a/prototypes/PKGBUILD-haskell.proto > b/prototypes/PKGBUILD-haskell.proto > index c63001e..2398777 100644 > --- a/prototypes/PKGBUILD-haskell.proto > +++ b/prototypes/PKGBUILD-haskell.proto > @@ -3,12 +3,12 @@ > # NOTE: Please fill out the license field for your package! If it is unknown, > # then please put 'unknown'. > > -# See http://wiki.archlinux.org/index.php/Haskell_package_guidelines for more > +# See https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines for > more > # information on Haskell packaging. > > # Maintainer: Your Name <[email protected]> > _hkgname=NAME > -pkgname=$_hkgname > +pkgname="$_hkgname" > pkgver=VERSION > pkgrel=1 > pkgdesc="" > @@ -22,8 +22,8 @@ conflicts=() > replaces=() > backup=() > options=() > -install=$pkgname.install > -source=(http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz) > +install="$pkgname.install" > +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";) > md5sums=() > > build() { > diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto > index 26b9c53..afa87a1 100644 > --- a/prototypes/PKGBUILD-perl.proto > +++ b/prototypes/PKGBUILD-perl.proto > @@ -13,7 +13,7 @@ > # Maintainer: Your Name <[email protected]> > _perlmod=MODNAME > _modnamespace=MODULE-NAMESPACE > -pkgname=perl-$_perlmod > +pkgname="perl-$_perlmod" > pkgver=VERSION > pkgrel=1 > pkgdesc="" > diff --git a/prototypes/PKGBUILD-python.proto > b/prototypes/PKGBUILD-python.proto > index 19b8f11..b6251fe 100644 > --- a/prototypes/PKGBUILD-python.proto > +++ b/prototypes/PKGBUILD-python.proto > @@ -3,7 +3,7 @@ > # NOTE: Please fill out the license field for your package! If it is unknown, > # then please put 'unknown'. > > -# See http://wiki.archlinux.org/index.php/Python_Package_Guidelines for more > +# See https://wiki.archlinux.org/index.php/Python_Package_Guidelines for more > # information on Python packaging. > > # Maintainer: Your Name <[email protected]> > @@ -21,7 +21,7 @@ provides=() > conflicts=() > replaces=() > backup=() > -options=(!emptydirs) > +options=('!emptydirs') > install= > source=() > md5sums=() > diff --git a/prototypes/PKGBUILD-rubygem.proto > b/prototypes/PKGBUILD-rubygem.proto > index 84fbd70..7a59fb9 100644 > --- a/prototypes/PKGBUILD-rubygem.proto > +++ b/prototypes/PKGBUILD-rubygem.proto > @@ -3,22 +3,22 @@ > # NOTE: Please fill out the license field for your package! If it is unknown, > # then please put 'unknown'. > > -# See http://wiki.archlinux.org/index.php/Ruby_Gem_Package_Guidelines for > more > +# See https://wiki.archlinux.org/index.php/Ruby_Gem_Package_Guidelines for > more > # information on Ruby Gem packaging. > > # Maintainer: Your Name <[email protected]> > _gemname=GEMNAME > -pkgname=ruby-$_gemname > +pkgname="ruby-$_gemname" > pkgver=VERSION > pkgrel=1 > pkgdesc="" > -arch=(any) > +arch=('any') > url="" > license=('GPL') > -depends=(ruby) # Full dependency information is available in the yaml > specification > -makedepends=(rubygems) > -source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem) > -noextract=($_gemname-$pkgver.gem) > +depends=('ruby') # Full dependency information is available in the YAML > specification > +makedepends=('rubygems') > +source=("http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem";) > +noextract=("$_gemname-$pkgver.gem") > md5sums=() > > package() { > diff --git a/prototypes/proto-gnome.install b/prototypes/proto-gnome.install > index 175a146..c8eab83 100644 > --- a/prototypes/proto-gnome.install > +++ b/prototypes/proto-gnome.install > @@ -1,7 +1,7 @@ > pkgname=NAME > > post_install() { > - usr/sbin/gconfpkg --install "$pkgname" > + gconfpkg --install "$pkgname" > update-desktop-database -q > } > > @@ -14,7 +14,7 @@ post_upgrade() { > } > > pre_remove() { > - usr/sbin/gconfpkg --uninstall "$pkgname" > + gconfpkg --uninstall "$pkgname" > } > > post_remove() { > diff --git a/prototypes/proto-info.install b/prototypes/proto-info.install > index 617652f..d306ad1 100644 > --- a/prototypes/proto-info.install > +++ b/prototypes/proto-info.install > @@ -2,7 +2,7 @@ infodir=usr/share/info > filelist=(foo.info bar) > > post_install() { > - [[ -x usr/bin/install-info ]] || return 0 > + [[ -x usr/bin/install-info ]] > for file in "${filelist[@]}"; do > install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null > done > @@ -13,7 +13,7 @@ post_upgrade() { > } > > pre_remove() { > - [[ -x usr/bin/install-info ]] || return 0 > + [[ -x usr/bin/install-info ]] > for file in "${filelist[@]}"; do > install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null > done > -- > 1.8.2 > > >
