- Arch-projects - lists.archlinux.org

[arch-projects] [netcfg] [PATCH] Makefile: fix dest for scp
by Florian Pritz 10 Apr '12

10 Apr '12

archlinux.org points to gudrun, but tarballs should be uploaded to gerolde. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1925af4..4ec4cb9 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ PKGBUILD: netcfg-$(VERSION).tar.xz upload: netcfg-$(VERSION).tar.xz md5sum $< > MD5SUMS.$(VERSION) - scp $< MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/ + scp $< MD5SUMS.$(VERSION) gerolde.archlinux.org:/srv/ftp/other/netcfg/ clean: $(MAKE) -C docs clean -- 1.7.9.5

2 1

[arch-projects] [netcfg][PATCH] systemd: move units from /lib to /usr/lib
by Tom Gundersen 10 Apr '12

10 Apr '12

This will allow us to get rid of /lib eventually. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1925af4..ce66066 100644 --- a/Makefile +++ b/Makefile @@ -35,11 +35,11 @@ install: install-docs rc.d/net-auto-wired \ rc.d/net-auto-wireless \ $(DESTDIR)/etc/rc.d/ - install -d $(DESTDIR)/lib/systemd/system + install -d $(DESTDIR)/usr/lib/systemd/system install -m644 \ systemd/net-auto-wireless.service \ systemd/net-auto-wired.service \ - $(DESTDIR)/lib/systemd/system/ + $(DESTDIR)/usr/lib/systemd/system/ install-wireless: install -d $(DESTDIR)/usr/lib/network/connections $(DESTDIR)/usr/bin \ -- 1.7.10

2 1

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.7.3-8-gfda34d4
by jouke＠archlinux.org 10 Apr '12

10 Apr '12

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 "netcfg network scripts repository". The branch, master has been updated via fda34d4a6c03e919786b26876d6a9c051119db1d (commit) via bc66a6906c5a1a55c5c9adc7c69f2370327db139 (commit) via 5d322f9f0ba3c68e56edd400662eb1ef39e22e6f (commit) via 4fdddbd1ca69ba90c415cdac3558bb1e6e46fbb0 (commit) via 93fd21fa56a12792123ece136c979f00aa35eafa (commit) via e4cbb65924b7ad4f3c2a89a53a59dcda8257a29e (commit) via c6ad0bd1294bddb78d1b47e48e8ce7657f91e1df (commit) via e65fad9b3aa4ce25fda0b6a79395025efbae4416 (commit) from c45fe39c38c47081ce2eda8c7c496052dbbb7dce (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 fda34d4a6c03e919786b26876d6a9c051119db1d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Apr 10 19:28:31 2012 +0200 Location based firewall support (FS#26380) Provide a sample hook file for supporting firewall rule sets based on network 'locations'. commit bc66a6906c5a1a55c5c9adc7c69f2370327db139 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Apr 10 18:23:30 2012 +0200 Remove multi-version support Having multiple versions of netcfg around is not supported. commit 5d322f9f0ba3c68e56edd400662eb1ef39e22e6f Author: Tom Gundersen <teg(a)jklm.no> Date: Tue Apr 10 16:47:50 2012 +0200 systemd: move units from /lib to /usr/lib This will allow us to get rid of /lib eventually. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 4fdddbd1ca69ba90c415cdac3558bb1e6e46fbb0 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Apr 10 17:52:55 2012 +0200 Output fixes Add spaces where necessary. commit 93fd21fa56a12792123ece136c979f00aa35eafa Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Apr 10 00:36:17 2012 +0200 PPP disconnect fix (FS#20569) Commit 6b43b missed the point. As noted by Cláudio, Jesse Young, Maciej Sitarz and Harley Laue. commit e4cbb65924b7ad4f3c2a89a53a59dcda8257a29e Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Apr 9 13:33:34 2012 +0200 Remove wireless-dbus and ethernet-iproute support - wireless-dbus is not simple enough for netcfg - some contributed code was not used and the rest of the code had caught up functionality wise - we switched to iproute so we need to stop pretending it is an 'option' - it is no longer fatal in the ifplugd scrict to have multiple preferred profiles commit c6ad0bd1294bddb78d1b47e48e8ce7657f91e1df Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Apr 9 13:31:30 2012 +0200 Minor changes commit e65fad9b3aa4ce25fda0b6a79395025efbae4416 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Apr 3 21:39:20 2012 +0200 Makefile: fix dest for scp archlinux.org points to gudrun, but tarballs should be uploaded to gerolde. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> ----------------------------------------------------------------------- Summary of changes: Makefile | 20 +--- contrib/bash-completion | 1 - contrib/iptables.hook | 17 +++ contrib/zsh-completion | 2 +- docs/features.txt | 9 +- rc.d/net-profiles | 8 +- scripts/ifplugd.action | 21 ++--- src-wireless/net-auto | 51 --------- src-wireless/netcfg-auto-wireless | 91 ---------------- src-wireless/wireless-dbus | 213 ------------------------------------- src/connections/ppp | 3 +- src/connections/wireless | 1 - src/globals | 37 +++---- src/network | 6 +- 14 files changed, 57 insertions(+), 423 deletions(-) create mode 100755 contrib/iptables.hook delete mode 100644 src-wireless/net-auto delete mode 100644 src-wireless/netcfg-auto-wireless delete mode 100644 src-wireless/wireless-dbus hooks/post-receive -- netcfg network scripts repository

1 0

arch-projects@archlinux.org � Pf|zer Inc � Discount-514454
by arch-projects＠archlinux.org 10 Apr '12

10 Apr '12

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag 0.8.7 created. 0.8.7
by dreisner＠archlinux.org 09 Apr '12

09 Apr '12

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 mkinitcpio repository". The annotated tag, 0.8.7 has been created at 04fa05476d4b7d56a79bd064496963a7f9812492 (tag) tagging 67e9b3378e4956ff1db29586eede73bfd8bf5e8f (commit) replaces 0.8.6 tagged by Dave Reisner on Sun Apr 8 21:58:08 2012 -0400 - Log ----------------------------------------------------------------- tag as 0.8.7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPgkIyAAoJEB6yY4/1bAxTDzcH/imvBP+g+85Gn/yIn3OWm3C8 PzkVvuZH0Jn+EKUMWsAT4Jc5Pgv/8vaSUTQL10l9iHrlP1vuXqENlzh0pfwKlABS aukkdgELQkqC2jcIFBhFTxDRHItMh8s5OIxIFdZeJQHiGj43WdJvkf8v5xttMoYl g3/7NrHKygGA++RGY6fdfuAMyd1vo2PGO6rcIecTn3vbaKLpiicwc7BeOiZIL/Aq W0RJFXXY4nkkuyQ/h7n+KPKI3xZN3Npiys3+ovpDUC+NA9/e2mTpDu6tBqcmlTKK Xz3jZ7IvhmTKADscxnxD1Wg+p9r1Wlm7EbYv1CzTi5+lZib058yDys2vvFazfpc= =8chk -----END PGP SIGNATURE----- Dave Reisner (3): mdadm: fix raid[456] autodetection hooks: use consistent shebang, modeline, function style btrfs: delete hooks -- these belong to core/btrfs Tobias Powalowski (1): fix pcmcia /usr move Tom Gundersen (1): hooks: remove pcmcia hook ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.8.6-5-g67e9b33
by dreisner＠archlinux.org 09 Apr '12

09 Apr '12

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 mkinitcpio repository". The branch, master has been updated via 67e9b3378e4956ff1db29586eede73bfd8bf5e8f (commit) via e44bc987c14a904b371718f9c1562135fc02c966 (commit) via 9c1fd3318a40ccb70797305fc91926f380887f99 (commit) from feef92a8fbb1ca54796dfcbe1a9b427b1c4e29e8 (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 67e9b3378e4956ff1db29586eede73bfd8bf5e8f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 21:25:41 2012 -0400 btrfs: delete hooks -- these belong to core/btrfs Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e44bc987c14a904b371718f9c1562135fc02c966 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 21:03:27 2012 -0400 hooks: use consistent shebang, modeline, function style Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 9c1fd3318a40ccb70797305fc91926f380887f99 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 20:09:36 2012 -0400 mdadm: fix raid[456] autodetection 20509ade neglected to filter the raid456 module when detecting raid[456] arrays, which lead to non-bootable systems from the autodetect-enabled image. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: hooks/btrfs | 7 ------- hooks/consolefont | 9 +++++---- hooks/keymap | 8 +++++--- hooks/sleep | 8 +++++--- install/autodetect | 2 +- install/btrfs | 15 --------------- 6 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 hooks/btrfs delete mode 100644 install/btrfs hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [initscripts][PATCH] functions: use a pipe for umount_all instead of a PE
by Dave Reisner 06 Apr '12

06 Apr '12

We don't care about the side effects of the subshell created by the pipe since everything is localized within this function. Use the more "canonical" syntax. This should stop the recurring bug reports that we seem to get from people who think they understand Bash syntax, e.g. FS#28331 FS#29145 FS#28582 FS#27098 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This patch sucks to read. functions | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/functions b/functions index f59f9dd..d8693e0 100644 --- a/functions +++ b/functions @@ -549,32 +549,31 @@ mount_all() { umount_all() { # $1: restrict to fstype - local mounts + findmnt -mrunRo TARGET,FSTYPE,OPTIONS / | { + while read -r target fstype options; do + # match only targetted fstypes + if [[ $1 && $1 != "$fstype" ]]; then + continue + fi - while read -r target fstype options; do + # don't unmount API filesystems + if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then + continue + fi - # match only targetted fstypes - if [[ $1 && $1 != "$fstype" ]]; then - continue - fi + # avoid networked devices + IFS=, read -ra opts <<< "$options" + if in_array _netdev "${opts[@]}"; then + continue + fi - # don't unmount API filesystems - if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then - continue - fi + mounts=("$target" "${mounts[@]}") + done - # avoid networked devices - IFS=, read -ra opts <<< "$options" - if in_array _netdev "${opts[@]}"; then - continue + if (( ${#mounts[*]} )); then + umount -r "${mounts[@]}" fi - - mounts=("$target" "${mounts[@]}") - done < <(findmnt -mrunRo TARGET,FSTYPE,OPTIONS /) - - if (( ${#mounts[*]} )); then - umount -r "${mounts[@]}" - fi + } } -- 1.7.9.6

1 0

[arch-projects] [ABS][PATCH] Bashify and quoting
by Sébastien Luttringer 06 Apr '12

06 Apr '12

Thanks to Lukas Fleischer for review Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- abs | 80 +++++++++++++++++++++++----------------------- makeworld | 50 ++++++++++++++--------------- scripts/svn2abs | 84 ++++++++++++++++++++++++------------------------- scripts/update-abs.sh | 22 ++++++------- 4 files changed, 118 insertions(+), 118 deletions(-) diff --git a/abs b/abs index 39d5798..25a3e1d 100755 --- a/abs +++ b/abs @@ -22,8 +22,8 @@ ## # Constants ## -ABS_VERSION="%%ABS_VERSION%%" -CONFDIR="%%CONF_DIR%%" +ABS_VERSION='%%ABS_VERSION%%' +CONFDIR='%%CONF_DIR%%' SYNCCMD='rsync' SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g' BUG_REPORT_EMAIL=pacman-dev(a)archlinux.org @@ -57,7 +57,7 @@ error() { ## # Source configuration ## -if [ -f "$CONFDIR/abs.conf" ]; then +if [[ -f $CONFDIR/abs.conf ]]; then source "$CONFDIR/abs.conf" else error "Could not find configuration file $CONFDIR/abs.conf" @@ -67,23 +67,23 @@ fi ## # User based overrides ## -[ -f ~/.abs.conf ] && source ~/.abs.conf +[[ -f ~/.abs.conf ]] && source ~/.abs.conf ## # Helper functions ## usage() { echo "Arch Build System $ABS_VERSION -- synchronization utility" - echo "" - echo "Usage:" + echo + echo 'Usage:' echo "$0 [options] [repository1[/package1] [repository2[/package2] ...]]" echo - echo "Options:" - echo " -h, --help Display this help message then exit." - echo " -V, --version Display version information then exit." - echo " -t, --tarball Sync ABS tree using tarballs from your pacman mirror." + echo 'Options:' + echo ' -h, --help Display this help message then exit.' + echo ' -V, --version Display version information then exit.' + echo ' -t, --tarball Sync ABS tree using tarballs from your pacman mirror.' echo - echo "abs will synchronize PKGBUILD scripts from the Arch Linux repositories" + echo 'abs will synchronize PKGBUILD scripts from the Arch Linux repositories' echo "into $ABSROOT via rsync. If no argument is given, abs will synchronize" echo "the repositories specified in ${CONFDIR}abs.conf." echo @@ -93,11 +93,11 @@ usage() { version() { echo "abs $ABS_VERSION" echo - echo "Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>" - echo "Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>" + echo 'Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>' + echo 'Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>' echo - echo "This is free software; see the source for copying conditions." - echo "There is NO WARRANTY, to the extent permitted by law." + echo 'This is free software; see the source for copying conditions.' + echo 'There is NO WARRANTY, to the extent permitted by law.' } update_rsync() { @@ -105,15 +105,15 @@ update_rsync() { cd "$ABSROOT" - if [ ! "$(type -p rsync)" ]; then - error "missing rsync synchronization utility. Install rsync." + if [[ -z $(type -p rsync) ]]; then + error 'missing rsync synchronization utility. Install rsync.' exit $_E_MISSING_PROGRAM fi - if [ "$CLPARAM" = "" ]; then + if [[ -z $CLPARAM ]]; then # using repos specified in abs.conf for repo in "${REPOS[@]}"; do - if [ "$repo" != "${repo#!}" ]; then + if [[ "$repo" != "${repo#!}" ]]; then EXCLUDE="${EXCLUDE} --filter=-_/${repo#!}/" fi done @@ -124,7 +124,7 @@ update_rsync() { # using repos/packages specified on the command line for param in "${REPOS[@]}"; do INCLUDE="${INCLUDE} --include=/${param}" - if [ "$param" != "${param/\/}" ]; then + if [[ "$param" != "${param/\/}" ]]; then repo=${param%/*} INCLUDE="${INCLUDE} --include=/${repo}" EXCLUDE="${EXCLUDE} --exclude=/${repo}/*" @@ -132,55 +132,55 @@ update_rsync() { done # remove duplicate values - INCLUDE=$(echo $INCLUDE | tr " " "\n" | sort -u | tr "\n" " ") + INCLUDE=$(echo $INCLUDE | tr ' ' '\n' | sort -u | tr '\n' ' ') EXCLUDE="${EXCLUDE} --exclude=/*" fi - msg "Starting ABS sync..." + msg 'Starting ABS sync...' $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/{${ARCH},any}/ $ABSROOT } update_tarball() { cd "$ABSROOT" - if [ ! "$(type -p wget)" ]; then - error "missing wget download utility. Install wget." + if [[ -z $(type -p wget) ]]; then + error 'missing wget download utility. Install wget.' exit $_E_MISSING_PROGRAM fi - if [ -f "$MIRRORLIST" ]; then - mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d" ") + if [[ -f $MIRRORLIST ]]; then + mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d' ') else error "Could not find pacman mirrorlist file $MIRRORLIST" exit $_E_CONFIG_ERROR fi - msg "Downloading tarballs..." + msg 'Downloading tarballs...' for repo in "${REPOS[@]}"; do - if [ "$repo" == "${repo#!}" ]; then + if [[ "$repo" == "${repo#!}" ]]; then echo " ==> ${repo}..." local ret - for mirror in ${mirrorlist[@]}; do + for mirror in "${mirrorlist[@]}"; do ret=0 tarball=$(echo $mirror | sed "s#\$repo#$repo#;s#\$arch#$ARCH#") tarball="${tarball}/${repo}.abs.tar.gz" protocol=$(echo $tarball | cut -f1 -d":") - if [ "$protocol" == "file" ]; then + if [[ "$protocol" == "file" ]]; then tarball=$(echo $tarball | sed "s#file://##") ln -s $tarball . 2>/dev/null || ret=$? - if [ $ret -ne 0 ]; then + if (( $ret != 0 )); then ret=0 fi else wget -q $tarball || ret=$? fi - if [ $ret -eq 0 ]; then + if (( $ret == 0 )); then break fi done - if [ $ret -ne 0 ]; then + if (( $ret != 0 )); then error "Download failed" continue fi @@ -202,8 +202,8 @@ trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR ## # Parse Options ## -OPT_SHORT="hVt" -OPT_LONG="help,version,tarball" +OPT_SHORT='hVt' +OPT_LONG='help,version,tarball' OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then # This is a small hack to stop the script bailing with 'set -e' @@ -224,7 +224,7 @@ while true; do shift done -if [ "$#" -gt "0" ]; then +if (( $# > 0 )); then CLPARAM=1 REPOS=("$@") fi @@ -232,12 +232,12 @@ fi ## # Verify Config ## -if [ ! -d "$ABSROOT" ]; then +if [[ ! -d $ABSROOT ]]; then error "$ABSROOT does not exist (or is not a directory)" exit $_E_CONFIG_ERROR fi -if [ ! -w "$ABSROOT" ]; then +if [[ ! -w $ABSROOT ]]; then error "no write permissions in $ABSROOT" exit $_E_CONFIG_ERROR fi @@ -247,9 +247,9 @@ fi ## # Use tarball method on first run -[ "$(ls -A $ABSROOT | sed -e 's#local##' -e 's#README##')" -o "$CLPARAM" ] || TARBALL=1 +[[ -n $(ls -A $ABSROOT | sed -e 's#local##' -e 's#README##') || -n $CLPARAM ]] || TARBALL=1 -if [ "$TARBALL" ]; then +if [[ -n $TARBALL ]]; then update_tarball else update_rsync diff --git a/makeworld b/makeworld index e5d9f0f..dd6e00b 100755 --- a/makeworld +++ b/makeworld @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -ABS_VERSION="%%ABS_VERSION%%" +ABS_VERSION='%%ABS_VERSION%%' BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' toplevel=$(pwd) @@ -31,38 +31,38 @@ trap 'error "Aborted by user! Exiting..."; exit 1' INT trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR usage() { - printf "makeworld %s - a makepkg wrapper to build multiple packages\n" "$myver" + printf 'makeworld %s - a makepkg wrapper to build multiple packages\n' "$myver" echo - printf "Usage: %s [options] <destdir> <repo> [repo] ...\n" "$0" + printf 'Usage: %s [options] <destdir> <repo> [repo] ...\n' "$0" echo - echo "Where <repo> is one or more directory names under the ABS root" - echo " eg: makeworld -c /packages core extra" + echo 'Where <repo> is one or more directory names under the ABS root' + echo ' eg: makeworld -c /packages core extra' echo - echo "This should be run from the toplevel directory of ABS (usually /var/abs)" + echo 'This should be run from the toplevel directory of ABS (usually /var/abs)' echo - echo "See makepkg --help for supported options (passed directly to makepkg)" + echo 'See makepkg --help for supported options (passed directly to makepkg)' } version() { - printf "makeworld %s\n" "$myver" - printf "\ + printf 'makeworld %s\n' "$myver" + printf '\ Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>\n\n\ Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n" +There is NO WARRANTY, to the extent permitted by law.\n' } # Source makepkg.conf; fail if it is not found (need this for $CARCH, $PKGEXT) -if [ -r "/etc/makepkg.conf" ]; then - source "/etc/makepkg.conf" +if [[ -r /etc/makepkg.conf ]]; then + source /etc/makepkg.conf else - printf "%s not found" "/etc/makepkg.conf" - echo "Aborting..." + printf '%s not found' '/etc/makepkg.conf' + echo 'Aborting...' exit 1 fi # Source user-specific makepkg.conf overrides -if [ -r ~/.makepkg.conf ]; then +if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi @@ -79,7 +79,7 @@ for arg in $*; do # and let it error out later if it was invalid MAKEPKG_OPTS="$MAKEPKG_OPTS $arg" ;; -*) - while getopts "AcCdefFghiLmorRsV-" opt; do + while getopts 'AcCdefFghiLmorRsV-' opt; do case $opt in h) usage; exit 0 ;; @@ -96,23 +96,23 @@ for arg in $*; do dest=$arg; shift; break ;; esac shift - if [ "$dest" != "" ]; then + if [[ -n $dest ]]; then break fi done -if [ "$dest" = "" ]; then +if [[ -z $dest ]]; then usage exit 1 fi -if [ $# -lt 1 ]; then +if (( $# < 1 )); then usage exit 1 fi # convert a (possibly) relative path to absolute -if [ ! -d "$dest" ]; then +if [[ ! -d $dest ]]; then echo "$dest does not exist, creating directory" mkdir "$dest" fi @@ -125,13 +125,13 @@ sd=$(date +"[%b %d %H:%M]") for repo in $*; do for pkg in $(find "$toplevel/$repo" -maxdepth 1 -mindepth 1 -type d | sort); do cd $pkg - if [ -f PKGBUILD ]; then - . PKGBUILD + if [[ -f PKGBUILD ]]; then + source PKGBUILD buildstatus=0 - if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT" -a ! -f "$dest/$pkgname-$pkgver-$pkgrel-any$PKGEXT" ]; then + if [[ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT" && ! -f "$dest/$pkgname-$pkgver-$pkgrel-any$PKGEXT" ]]; then PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>&1 1>&2 | tee -a $toplevel/makepkg.log - if [ ${PIPESTATUS[0]} -ne 0 ]; then + if (( ${PIPESTATUS[0]} != 0 )); then buildstatus=2 else buildstatus=1 @@ -151,7 +151,7 @@ for repo in $*; do done ed=$(date +"[%b %d %H:%M]") -echo "makeworld complete." >>$toplevel/build.log +echo 'makeworld complete.' >>$toplevel/build.log echo " started: $sd" >>$toplevel/build.log echo " finished: $ed" >>$toplevel/build.log diff --git a/scripts/svn2abs b/scripts/svn2abs index 0d4c74d..102c731 100755 --- a/scripts/svn2abs +++ b/scripts/svn2abs @@ -21,7 +21,7 @@ ## # Constants ## -ABS_VERSION="%%ABS_VERSION%%" +ABS_VERSION='%%ABS_VERSION%%' TREE_DIR=/tmp/__abs-tree__ # Directory to store the extracted ABS tree ## @@ -41,29 +41,29 @@ function usage() echo " $0 (-v | --version)" echo " $0 (-h | --help)" echo - echo "Takes svn repo structure of form \$pkgname/repos/\$repo-\$arch" - echo "and converts it to the ABS structure of \$arch/\$repo/\$pkgname" + echo 'Takes svn repo structure of form $pkgname/repos/$repo-$arch' + echo 'and converts it to the ABS structure of $arch/$repo/$pkgname' echo "then syncs ABS tree in $ABS_DIR with extracted structure." echo - echo "Options:" - echo " -h | --help - show this message" - echo " -v | --version - show version information" + echo 'Options:' + echo ' -h | --help - show this message' + echo ' -v | --version - show version information' echo - echo "Parameters:" - echo " [svn checkout dir] - dir to store svn checkout. Defaults to" + echo 'Parameters:' + echo ' [svn checkout dir] - dir to store svn checkout. Defaults to' echo " $CHECKOUT_DIR" - echo " [abs dir] - dir containing abs tree to update. Defaults to" + echo ' [abs dir] - dir containing abs tree to update. Defaults to' echo " $ABS_DIR" - echo " [svn repo location] - URL to subversion repo containing PKGBUILDs" + echo ' [svn repo location] - URL to subversion repo containing PKGBUILDs' } version() { echo "svn2abs $ABS_VERSION" echo - echo "Copyright (C) 2008-2010 Aaron Griffin <aaron(a)archlinux.org>." + echo 'Copyright (C) 2008-2010 Aaron Griffin <aaron(a)archlinux.org>.' echo - echo "This is free software; see the source for copying conditions." - echo "There is NO WARRANTY, to the extent permitted by law." + echo 'This is free software; see the source for copying conditions.' + echo 'There is NO WARRANTY, to the extent permitted by law.' } @@ -75,12 +75,12 @@ function checkout_svn() local targetdir=$1 local origdir=$(pwd) - if [ -f "$targetdir" ]; then + if [[ -f $targetdir ]]; then echo "Could not create checkout target $targetdir. File exists." return 1 fi - if [ ! -d "$targetdir" ]; then + if [[ ! -d $targetdir ]]; then mkdir "$targetdir" fi @@ -89,23 +89,23 @@ function checkout_svn() # Simple check - if $targetdir/.svn exists, then we can assume # the repo has been checked out (ie. we can just run an update # instead of a full checkout) - if [ -d "./.svn" ]; then + if [[ -d './.svn' ]]; then # Checkout already exists - just update it - echo "Updating SVN repo..." + echo 'Updating SVN repo...' svn update else # Checkout the tree into $targetdir - echo "Checking out SVN repo..." + echo 'Checking out SVN repo...' svn co "$SVN_REPO_LOCATION" ./ fi - if [ "$?" != "0" ]; then + if (( $? != 0 )); then cd "$origdir" - echo "Error with SVN checkout/update." + echo 'Error with SVN checkout/update.' return 1 fi - echo "SVN checkout/update complete." + echo 'SVN checkout/update complete.' cd "$origdir" return 0 @@ -124,17 +124,17 @@ function extract_abs_tree() local checkoutdir="$1" local origdir=$(pwd) - if [ ! -d "$checkoutdir" ]; then + if [[ ! -d "$checkoutdir" ]]; then echo "SVN checkout dir $checkoutdir does not exist" return 1 fi - if [ -f "$targetdir" ]; then + if [[ -f "$targetdir" ]]; then echo "Could not create abs tree target $targetdir. File exists." return 1 fi - if [ ! -d "$targetdir" ]; then + if [[ ! -d "$targetdir" ]]; then mkdir "$targetdir" else # Clear out target dir @@ -142,14 +142,14 @@ function extract_abs_tree() fi cd "$targetdir" - local targetdir="$(pwd)" + local targetdir=$(pwd) cd - cd "$checkoutdir" for pkg in *; do # It seems that some repos directories have no tags in them... - if [ -d "$pkg" -a -d "$pkg/repos" ]; then + if [[ -d "$pkg" && -d "$pkg/repos" ]]; then echo "Creating ABS tree for package $pkg" cd $pkg/repos @>/dev/null @@ -157,8 +157,8 @@ function extract_abs_tree() for repo in $(ls); do arch=$(echo $repo | sed "s/.*-$.*$/\1/") dest_repo=$(echo $repo | sed "s/$.*$-.*/\1/") - mkdir -p $targetdir/$arch/$dest_repo/$pkg - cp -r $repo/* $targetdir/$arch/$dest_repo/$pkg + mkdir -p "$targetdir/$arch/$dest_repo/$pkg" + cp -r "$repo"/* "$targetdir/$arch/$dest_repo/$pkg" done cd ../../ @@ -176,36 +176,36 @@ function extract_abs_tree() ## # Simple params ## -if [ "$1" = "-h" -o "$1" = "--help" ]; then +if [[ "$1" == '-h' || "$1" == '--help' ]]; then usage exit 0 fi -if [ "$1" = "-v" -o "$1" = "--version" ]; then +if [[ "$1" == '-v' || "$1" == '--version' ]]; then version exit 0 fi -if [ "$1" != "" ]; then +if [[ -n $1 ]]; then CHECKOUT_DIR=$1 fi -if [ "$2" != "" ]; then +if [[ -n $2 ]]; then ABS_DIR=$2 fi -if [ "$3" != "" ]; then +if [[ -n $3 ]]; then SVN_REPO_LOCATION=$3 fi ## # Check config ## -if [ "$ABS_DIR" = "" ]; then - echo "No ABS_DIR specified!" +if [[ -z $ABS_DIR ]]; then + echo 'No ABS_DIR specified!' exit 1 -elif [ ! -d "$ABS_DIR" ]; then - echo "ABS_DIR not a directory." +elif [[ ! -d $ABS_DIR ]]; then + echo 'ABS_DIR not a directory.' exit 1 fi @@ -215,8 +215,8 @@ fi checkout_svn "$CHECKOUT_DIR" || exit 1 extract_abs_tree "$CHECKOUT_DIR" "$TREE_DIR" -if [ "$?" -ne "0" ]; then - echo "Error occurred extracting the abs tree." +if (( $? != 0 )); then + echo 'Error occurred extracting the abs tree.' exit 1 fi @@ -231,9 +231,9 @@ for abs_arch in $(ls); do done cd - -echo "Cleaning up..." -rm -r $TREE_DIR +echo 'Cleaning up...' +rm -r "$TREE_DIR" -echo "Done!" +echo 'Done!' # vim: set ts=2 sw=2 noet: diff --git a/scripts/update-abs.sh b/scripts/update-abs.sh index ff3510e..4e313ff 100644 --- a/scripts/update-abs.sh +++ b/scripts/update-abs.sh @@ -7,8 +7,8 @@ ARCHES=('i686' 'x86_64' 'any') mkdir -p /srv/abs/{checkout,rsync,tree} # clear any "broken" entries from previous ABS tree generation -for server in ${SERVERS[@]}; do - [ -d /srv/abs/tree/$server ] && rm -rf /srv/abs/tree/$server/* +for server in "${SERVERS[@]}"; do + [[ -d "/srv/abs/tree/$server" ]] && rm -rf "/srv/abs/tree/$server"/* done # create ABS trees @@ -16,27 +16,27 @@ done /srv/abs/svn2abs /srv/abs/checkout/sigurd /srv/abs/tree/sigurd file:///srv/svn-community # clean and regenerate ABS rsync folder -for arch in ${ARCHES[@]}; do - if [ ! -d /srv/abs/rsync/$arch ]; then - mkdir /srv/abs/rsync/$arch +for arch in "${ARCHES[@]}"; do + if [[ ! -d "/srv/abs/rsync/$arch" ]]; then + mkdir "/srv/abs/rsync/$arch" else - rm -rf /srv/abs/rsync/$arch/* + rm -rf "/srv/abs/rsync/$arch"/* fi - for server in ${SERVERS[@]}; do - if [ -d /srv/abs/tree/$server/$arch ]; then - mv /srv/abs/tree/$server/$arch/* /srv/abs/rsync/$arch/ + for server in "${SERVERS[@]}"; do + if [[ -d "/srv/abs/tree/$server/$arch" ]]; then + mv "/srv/abs/tree/$server/$arch"/* "/srv/abs/rsync/$arch/" fi done done # generate tarballs for package mirrors for repo in testing core extra community community-testing; do - for arch in ${ARCHES[@]/any/}; do + for arch in "${ARCHES[@]/any/}"; do tarcmd="tar -czf /srv/ftp/${repo}/os/${arch}/${repo}.abs.tar.gz \ -C /srv/abs/rsync/${arch} ${repo}" - if [ -d "/srv/abs/rsync/any/${repo}" ]; then + if [[ -d "/srv/abs/rsync/any/${repo}" ]]; then tarcmd="$tarcmd -C /srv/abs/rsync/any ${repo}" fi -- Sebastien "Seblu" Luttringer

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.8.6-2-gfeef92a
by dreisner＠archlinux.org 04 Apr '12

04 Apr '12

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 mkinitcpio repository". The branch, master has been updated via feef92a8fbb1ca54796dfcbe1a9b427b1c4e29e8 (commit) from 0d8aaef7d37ca33bd19dda34c0aca5b86e1facc3 (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 feef92a8fbb1ca54796dfcbe1a9b427b1c4e29e8 Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Apr 4 14:00:54 2012 +0200 hooks: remove pcmcia hook This hook has been moved to the pcmciautils package. Signed-off-by: Tom Gundersen <teg(a)jklm.no> Acked-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: install/pcmcia | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) delete mode 100644 install/pcmcia hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH] hooks: remove pcmcia hook
by Tom Gundersen 04 Apr '12

04 Apr '12

This hook has been moved to the pcmciautils package. Signed-off-by: Tom Gundersen <teg(a)jklm.no> Acked-by: Dave Reisner <d(a)falconindy.com> --- install/pcmcia | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 install/pcmcia diff --git a/install/pcmcia b/install/pcmcia deleted file mode 100644 index 71052d6..0000000 --- a/install/pcmcia +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -build() { - FILES="/etc/pcmcia/config.opts" - MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" - - [[ $MODULES ]] && MODULES+=" sd_mod?" - - add_binary "/usr/lib/udev/pcmcia-socket-startup" - add_binary "/usr/lib/udev/pcmcia-check-broken-cis" - add_file "/usr/lib/udev/rules.d/60-pcmcia.rules" -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for a pcmcia root device. Detection will -take place at runtime. To minimize the modules in the image, add the autodetect -hook too. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: -- 1.7.9.6

1 0