- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH] functions: add_udev_rules and add_systemd_unit
by Tom Gundersen 14 Apr '13

14 Apr '13

add_udev_rules() adds a rules file and pulls in the necessary binaries udev rules by automatically pulling in the necessary binaries. add_systemd_unit() pulls in the necessary binaries, and also Requires= and OnFailure= units. Moreover, it pulls in any symlinks to the unit in any .wants or .requires directories. --- functions | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/functions b/functions index 432d700..12df3cd 100644 --- a/functions +++ b/functions @@ -569,6 +569,104 @@ add_binary() { return 0 } +add_udev_rules() { + # Add an udev rules file to the initcpio image. Dependencies on binaries + # will be discovered and added. + # $1: path to rules file (or name of rules file) + + local udevdir= rules= rule= entry= key= value= binary= + + udevdir=$(pkg-config --variable=udevdir udev) + + if [[ ${1:0:1} != '/' ]]; then + rules="${udevdir}/rules.d/${1}" + else + rules=$1 + fi + + add_file "${rules}" + + while read rule; do + if [[ ${rule:0:1} == '#' ]]; then + continue + fi + + IFS=', ' + for entry in ${rule}; do + + IFS='=' read key value <<< "${entry}" + + if [[ ( ${key:0:3} == "RUN" && + ${key:4:7} != "builtin" ) || + ${key:0:7} == "PROGRAM" || + ${key:0:15} == "IMPORT{program}" || + ${key:0:15} == "ENV{REMOVE_CMD}" ]]; then + + binary=${value//\"/} + if [[ ${binary:0:1} != '/' ]]; then + binary="${udevdir}/${binary}" + fi + + read -d ' ' binary <<< "${binary} " + add_binary "${binary}" + fi + done + done < "$rules" +} + +add_systemd_unit() { + # Add a systemd unit file to the initcpio image. Dependencies on binaries + # and other unit files will be discovered and added. + # $1: path to rules file (or name of rules file) + + local unitdir= unit= rule= entry= key= value= binary= dep= + + unitdir=$(pkg-config --variable=systemdsystemunitdir systemd) + + if [[ ${1:0:1} != '/' ]]; then + unit="${unitdir}/${1}" + else + unit=$1 + fi + + add_file "${unit}" + + while read entry; do + if [[ ${entry:0:1} == '#' ]]; then + continue + fi + + IFS='=' read key value <<< "${entry}" + + if [[ ${key:0:4} == 'Exec' ]]; then + binary=${value//\"/} + if [[ ${binary:0:1} != '-' ]]; then + read -d ' ' binary <<< "${binary} " + add_binary "${binary}" + fi + fi + + if [[ ${key} == 'Requires' || ${key} == 'OnFailure' ]]; then + for dep in ${value}; do + add_systemd_unit ${dep} + done + fi + + done < "$unit" + + for dep in "${unitdir}"/*.{wants,requires}/$(basename $unit); do + if [[ -h "${dep}" ]]; then + add_symlink "${dep}" + fi + done + + if [[ -d "${unit}.requires" ]]; then + for dep in "${unit}".requires/*; do + add_systemd_unit $(basename $dep) + done + fi +} + parse_config() { # parse key global variables set by the config file. -- 1.8.2.1

3 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 0.8-14-g748fed6
by jouke＠archlinux.org 13 Apr '13

13 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 748fed60e3c4950b431d5d3c4fae70cb1cc59d4c (commit) via 6116dfaf2e2c0fe51d1cd0998e697acb5136b481 (commit) from aa20dd1eaeecd73e52d656ac3ca4d1a2a558edba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 748fed60e3c4950b431d5d3c4fae70cb1cc59d4c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Apr 13 14:31:21 2013 +0200 Allow IP6 address to be set in case IP6=stateless Router advertisements can tell clients to not generate a public address automatically (AdvAutonomous off). Reported by: Jonne Haß commit 6116dfaf2e2c0fe51d1cd0998e697acb5136b481 Author: Daniel Oertwig <Daniel.Oertwig(a)googlemail.com> Date: Fri Apr 12 14:04:40 2013 +0300 ExecDownPre is executed BEFORE the con is brought down ExecDownPre is executed before the connection is brought down, not after, as the man suggests. See netctl/src/lib/network line 75 ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 6 +++--- src/lib/ip | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [PATCH] makechrootpkg: Copy VCS sources too
by Jan Alexander Steffens (heftig) 11 Apr '13

11 Apr '13

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> Steal some functions from makepkg in order to parse the PKGBUILD --- makechrootpkg.in | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 7796298..fbca3f3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -237,14 +237,53 @@ export CARCH # Copy PKGBUILD and sources cp PKGBUILD "$copydir/build/" ( + # extract the protocol from a source entry - return "local" for local sources + get_protocol() { + if [[ $1 = *://* ]]; then + # strip leading filename + local proto="${1##*::}" + printf "%s\n" "${proto%%://*}" + else + printf "%s\n" local + fi + } + + # extract the filename from a source entry + get_filename() { + local netfile=$1 + + # if a filename is specified, use it + if [[ $netfile = *::* ]]; then + printf "%s\n" ${netfile%%::*} + return + fi + + local proto=$(get_protocol "$netfile") + + case $proto in + bzr*|git*|hg*|svn*) + filename=${netfile%%#*} + filename=${filename%/} + filename=${filename##*/} + if [[ $proto = git* ]]; then + filename=${filename%%.git*} + fi + ;; + *) + # if it is just an URL, we only keep the last component + filename="${netfile##*/}" + ;; + esac + printf "%s\n" "${filename}" + } + source PKGBUILD for file in "${source[@]}"; do - file="${file%%::*}" - file="${file##*://*/}" - if [[ -f $file ]]; then - cp "$file" "$copydir/srcdest/" - elif [[ -f $SRCDEST/$file ]]; then - cp "$SRCDEST/$file" "$copydir/srcdest/" + file="$(get_filename "$file")" + if [[ -e $file ]]; then + cp -a "$file" "$copydir/srcdest/" + elif [[ -e $SRCDEST/$file ]]; then + cp -a "$SRCDEST/$file" "$copydir/srcdest/" fi done @@ -312,8 +351,8 @@ else fi for f in "$copydir"/srcdest/*; do - chown "$src_owner" "$f" - mv "$f" "$SRCDEST" + chown -R "$src_owner" "$f" + cp -af "$f" "$SRCDEST/" done if $temp_chroot; then -- 1.8.2

1 1

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 0.8-12-gaa20dd1
by jouke＠archlinux.org 10 Apr '13

10 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via aa20dd1eaeecd73e52d656ac3ca4d1a2a558edba (commit) via 0f36b0b8553e540e37cab99666a2a577fefdf12c (commit) via f54a4ef76b36d7652778bf510c69739d7db32d33 (commit) via 492fe67b4ae418feda69074f3335be14fbcc79ab (commit) via 7cd83d3db74606f6a7a881e123b0c3e49f497ed8 (commit) via e34538b84fee1ba1b98952bb07f2343ea88141c1 (commit) via 1bb83f8bd73ebf86908685850c727d6786922cd4 (commit) via 5446a009aa33f53d58ee2dfb099ea1edcc877036 (commit) via 754a4c1094338bec4b07abe06948ac51843b07ca (commit) from 9ff72561e32ec6aa409f0c50757481a9032595ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit aa20dd1eaeecd73e52d656ac3ca4d1a2a558edba Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Apr 10 20:33:38 2013 +0200 Fix DHCPOptions Split them into different variables for different clients. Also, IP6 gets its own, so that it can have options different from the IP4 invocation. commit 0f36b0b8553e540e37cab99666a2a577fefdf12c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Apr 10 20:33:03 2013 +0200 Uniformize modelines commit f54a4ef76b36d7652778bf510c69739d7db32d33 Merge: 9ff7256 492fe67 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Apr 10 11:28:11 2013 -0700 Merge pull request #21 from zoqaeski/mobile-broadband Mobile broadband with ppp commit 492fe67b4ae418feda69074f3335be14fbcc79ab Author: Robbie Smith <zoqaeski(a)gmail.com> Date: Wed Apr 10 11:33:37 2013 +1000 Changed connections to use underscores. commit 7cd83d3db74606f6a7a881e123b0c3e49f497ed8 Author: Robbie Smith <zoqaeski(a)gmail.com> Date: Wed Apr 3 16:15:33 2013 +1100 Code tidying up. Renamed mobile connection to mobile-ppp. Also: - Replaced echos with invocations of cat, where possible. - Fixed PIDFILE to point to the file ppp creates. This ensures the interface can be brought down. - Fixed setting of InterfaceRoot. - Removed vim syntax highlighting from ethernet connection. commit e34538b84fee1ba1b98952bb07f2343ea88141c1 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 30 10:58:04 2013 +0100 Support more interface types This allows future connection types to use interfaces other than networking interfaces, for instance to use USB interfaces. commit 1bb83f8bd73ebf86908685850c727d6786922cd4 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Mar 29 12:06:49 2013 +0100 Documentation update Rebuild all the manpages because version information may have changed. Add a few words on options that are ignored in some cases. commit 5446a009aa33f53d58ee2dfb099ea1edcc877036 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Mar 29 12:05:01 2013 +0100 Simplify wpa network block creation It had grown a little diffuse. commit 754a4c1094338bec4b07abe06948ac51843b07ca Author: Robbie Smith <zoqaeski(a)gmail.com> Date: Mon Apr 1 18:26:03 2013 +1100 Added ppp mobile by porting from netcfg. ----------------------------------------------------------------------- Summary of changes: docs/examples/mobile_ppp | 34 ++++++++++ docs/netctl.profile.5.txt | 2 +- src/lib/auto.action | 4 +- src/lib/connections/bond | 2 +- src/lib/connections/bridge | 2 +- src/lib/connections/ethernet | 2 +- src/lib/connections/mobile_ppp | 147 +++++++++++++++++++++++++++++++++++++++++ src/lib/connections/tunnel | 2 +- src/lib/connections/tuntap | 2 +- src/lib/connections/vlan | 2 +- src/lib/connections/wireless | 2 +- src/lib/ip | 6 +- src/wifi-menu | 3 + 13 files changed, 197 insertions(+), 13 deletions(-) create mode 100644 docs/examples/mobile_ppp create mode 100644 src/lib/connections/mobile_ppp hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20130408 created. 20130408
by pierre＠archlinux.org 08 Apr '13

08 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The annotated tag, 20130408 has been created at ddd5db03780ffc3062c9fe656193408cfc35318d (tag) tagging 6e086f0e703194fcefe0040e2b5e967fa5ab307f (commit) replaces 20130406 tagged by Pierre Schmitz on Mon Apr 8 18:27:10 2013 +0200 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRYu/nAAoJEH8tQ0uXQeisMagH/23VCBcWGYc8apboUdqh3uG0 HW/upHxC/mAF6gKrHc+iyWavug8IM5J7OljbgyHAvtRNt670hVP+2bzfo1krPCLE N7UZhloeBleXxOkkiHDGhw0i89JtxUeCP5mibaWVvVTeQx4xcQu0k1ZFqa2u5gvI BKflMRvwuQQ9Eqfk815ZSpqcCbb6IY+HJyJQI5tcY/aT0oycL4F+cbEruP5gwid+ EASXsqXfpH5sGhwl9XSG1Elc5v/dBEBjTuOo2c3KcltHMRk43T/5/zuZGM81qjEo 4Vdf11WIKTUVfWIXtYeao4KHMGRjqxHo8l3lPSAgC6Xp6A2CY1w/uHxyYZkkEcQ= =Ze75 -----END PGP SIGNATURE----- Pierre Schmitz (2): mkarchroot: Fix creation of btrfs snapshot and remove force option Prepare release Sébastien Luttringer (1): makechrootpkg: Add option to build in temp chroot ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130406-3-g6e086f0
by pierre＠archlinux.org 08 Apr '13

08 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 6e086f0e703194fcefe0040e2b5e967fa5ab307f (commit) via 93d735981b0c5fba039db0f1cb73fc8c1ea3ea1c (commit) from 97a2d2414a7f9d4abce3a40320fe9e0883155884 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6e086f0e703194fcefe0040e2b5e967fa5ab307f Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Mon Apr 8 18:09:19 2013 +0200 Prepare release commit 93d735981b0c5fba039db0f1cb73fc8c1ea3ea1c Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Thu Mar 14 03:55:40 2013 +0100 makechrootpkg: Add option to build in temp chroot Add option -T to build in a temporary chroot. This apply to any kind of filesytem and allow to easily parrallelize builds. This patch also simplify how $default_copy and $copy are defined. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makechrootpkg.in | 33 +++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [PATCH] [abs] Remove VCS PKGBUILD prototypes
by Jason St. John 08 Apr '13

08 Apr '13

From: "Jason St. John" <jstjohn(a)purdue.edu> pacman 4.1 greatly simplied the use of VCS PKGBUILDs. Usage of VCS PKGBUILDs is documented in PKGBUILD(5) and on the ArchWiki. Including a separate prototype for each VCS is unnecessary, and they should be removed. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- prototypes/PKGBUILD-bzr.proto | 64 --------------------------------------- prototypes/PKGBUILD-cvs.proto | 65 ---------------------------------------- prototypes/PKGBUILD-darcs.proto | 66 ----------------------------------------- prototypes/PKGBUILD-git.proto | 64 --------------------------------------- prototypes/PKGBUILD-hg.proto | 65 ---------------------------------------- prototypes/PKGBUILD-svn.proto | 63 --------------------------------------- 6 files changed, 387 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-cvs.proto delete mode 100644 prototypes/PKGBUILD-darcs.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto deleted file mode 100644 index 81f145f..0000000 --- a/prototypes/PKGBUILD-bzr.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from Bazaar sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-bzr -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('bzr') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_bzrtrunk=BZRURL -_bzrmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to Bazaar server...." - - if [[ -d "$_bzrmod" ]]; then - cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" - msg "The local files are updated." - else - bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" - fi - - msg "Bazaar checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_bzrmod-build" - cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build" - cd "$srcdir/$_bzrmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_bzrmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto deleted file mode 100644 index 982c149..0000000 --- a/prototypes/PKGBUILD-cvs.proto +++ /dev/null @@ -1,65 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from CVS sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-cvs -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('cvs') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_cvsroot=CVSROOT -_cvsmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to $_cvsmod.sourceforge.net CVS server...." - - if [[ -d "$_cvsmod/CVS" ]]; then - cd "$_cvsmod" - cvs -z3 update -d - else - cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod" - cd "$_cvsmod" - fi - - msg "CVS checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_cvsmod-build" - cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build" - cd "$srcdir/$_cvsmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_cvsmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto deleted file mode 100644 index 979e9b5..0000000 --- a/prototypes/PKGBUILD-darcs.proto +++ /dev/null @@ -1,66 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from darcs sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-darcs -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('darcs') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_darcstrunk=DARCSURL -_darcsmod=MODNAME - -build() { - cd "$srcdir" - msg "Checking for previous build...." - - if [[ -d "$_darcsmod/_darcs" ]]; then - msg "Retrieving missing patches" - cd "$_darcsmod" - darcs pull -a "$_darcstrunk/$_darcsmod" - else - msg "Retrieving complete sources" - darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod" - cd "$_darcsmod" - fi - - rm -rf "$srcdir/$_darcsmod-build" - cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build" - cd "$srcdir/$_darcsmod-build" - - msg "Starting build..." - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_darcsmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto deleted file mode 100644 index 05b721b..0000000 --- a/prototypes/PKGBUILD-git.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from GIT sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-git -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('git') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_gitroot=GITURL -_gitname=MODENAME - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_gitname-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto deleted file mode 100644 index 8474533..0000000 --- a/prototypes/PKGBUILD-hg.proto +++ /dev/null @@ -1,65 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from Mercurial(hg) sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-hg -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('mercurial') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_hgroot=HGURL -_hgrepo=REPONAME - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - cd "$srcdir/$_hgrepo-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_hgrepo-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto deleted file mode 100644 index aff5ca9..0000000 --- a/prototypes/PKGBUILD-svn.proto +++ /dev/null @@ -1,63 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from SVN sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-svn -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('subversion') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_svntrunk=SVNURL -_svnmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to SVN server...." - - if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") - else - svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" - fi - - msg "SVN checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_svnmod-build" - svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: -- 1.8.2

2 2

[arch-projects] [PATCH] [abs] Remove the bzr, git, hg, and svn PKGBUILD prototypes that are better supported in pacman 4.1
by Jason St. John 08 Apr '13

08 Apr '13

From: "Jason St. John" <jstjohn(a)purdue.edu> CVS and Darcs are not supported in normal PKGBUILDs in pacman 4.1 like Bazaar, Git, Mercurial, and Subversion are, so CVS and Darcs prototypes should remain for now. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- prototypes/PKGBUILD-bzr.proto | 64 ------------------------------------------ prototypes/PKGBUILD-git.proto | 64 ------------------------------------------ prototypes/PKGBUILD-hg.proto | 65 ------------------------------------------- prototypes/PKGBUILD-svn.proto | 63 ----------------------------------------- 4 files changed, 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto deleted file mode 100644 index 81f145f..0000000 --- a/prototypes/PKGBUILD-bzr.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from Bazaar sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-bzr -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('bzr') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_bzrtrunk=BZRURL -_bzrmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to Bazaar server...." - - if [[ -d "$_bzrmod" ]]; then - cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" - msg "The local files are updated." - else - bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" - fi - - msg "Bazaar checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_bzrmod-build" - cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build" - cd "$srcdir/$_bzrmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_bzrmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto deleted file mode 100644 index 05b721b..0000000 --- a/prototypes/PKGBUILD-git.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from GIT sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-git -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('git') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_gitroot=GITURL -_gitname=MODENAME - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_gitname-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto deleted file mode 100644 index 8474533..0000000 --- a/prototypes/PKGBUILD-hg.proto +++ /dev/null @@ -1,65 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from Mercurial(hg) sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-hg -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('mercurial') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_hgroot=HGURL -_hgrepo=REPONAME - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - cd "$srcdir/$_hgrepo-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_hgrepo-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto deleted file mode 100644 index aff5ca9..0000000 --- a/prototypes/PKGBUILD-svn.proto +++ /dev/null @@ -1,63 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# 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/VCS_PKGBUILD_Guidelines -# for more information on packaging from SVN sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-svn -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('subversion') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_svntrunk=SVNURL -_svnmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to SVN server...." - - if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") - else - svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" - fi - - msg "SVN checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_svnmod-build" - svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: -- 1.8.2

1 0

[arch-projects] [PATCH] [abs] Clean up prototypes (quoting, links in comments, etc.)
by Jason St. John 08 Apr '13

08 Apr '13

From: "Jason St. John" <jstjohn(a)purdue.edu> 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. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- 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 <youremail(a)domain.com> 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 <youremail(a)domain.com> _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-$pk…") 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 <youremail(a)domain.com> _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 <youremail(a)domain.com> @@ -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 <youremail(a)domain.com> _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

2 4

[arch-projects] [PATCH] [abs] Clean up prototypes (quoting, links in comments, etc.)
by Jason St. John 08 Apr '13

08 Apr '13

From: "Jason St. John" <jstjohn(a)purdue.edu> 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. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- 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 ++-- 6 files changed, 20 insertions(+), 20 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 <youremail(a)domain.com> 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 <youremail(a)domain.com> _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-$pk…") 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 <youremail(a)domain.com> _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 ed8b7d0..c0727b7 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 <youremail(a)domain.com> @@ -23,7 +23,7 @@ provides=() conflicts=() replaces=() backup=() -options=(!emptydirs) +options=('!emptydirs') install= source=("https://pypi.python.org/packages/source/$_firstletter/$_pythonname/$_python…") 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 <youremail(a)domain.com> _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() { -- 1.8.2

1 0