- Arch-projects - lists.archlinux.org

[arch-projects] Issue about shutdown hook in mkinitcpio/initscripts (/run is noexec)
by Gerardo Exequiel Pozzi 25 Aug '11

25 Aug '11

Hello, I am testing this for archiso (I think will help me for dm-snapshot persistent). I am writing custom shutdown hooks that fit for archiso. Anyway, /run is mounted as noexec. This should be changed ;) :: Creating shutdown ramfs...chroot: can't execute '/bin/busybox': Permission denied all rest of things will fail ;) http://mailman.archlinux.org/pipermail/arch-projects/2011-July/001549.html -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

3 4

[arch-projects] [devtools] [PATCH] archrelease: Fix behaviour with non-standard trunk name
by Lukas Fleischer 25 Aug '11

25 Aug '11

Do not hardcode the name of the package trunk directory and accept varying directory names, such as "gnome-unstable". Regression introduced in 8384ad849dfe308ed3e63e252785b9a6f80474f5. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Based on my refactoring patches. archrelease | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archrelease b/archrelease index 2ca0b95..2f6a563 100755 --- a/archrelease +++ b/archrelease @@ -30,7 +30,7 @@ if [[ $(svn status -q) ]]; then fi pushd .. >/dev/null -IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "trunk") +IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "$trunk") for file in "${known_files[@]}"; do if [[ ${file:(-1)} = '/' ]]; then abort "archrelease: subdirectories are not supported in package directories!" @@ -38,7 +38,7 @@ for file in "${known_files[@]}"; do done for tag in "$@"; do - echo -n "copying trunk to ${tag}..." + echo -n "copying ${trunk} to ${tag}..." if [[ -d repos/$tag ]]; then declare -a trash @@ -53,7 +53,7 @@ for tag in "$@"; do fi for file in "${known_files[@]}"; do - svn copy -q -r HEAD "trunk/$file" "repos/$tag/" + svn copy -q -r HEAD "$trunk/$file" "repos/$tag/" done echo 'done' @@ -61,7 +61,7 @@ done echo -n "releasing package..." printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }" -svn commit -q -m "archrelease: copy trunk to $tag_list" || abort +svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort echo 'done' popd >/dev/null -- 1.7.6

2 1

[arch-projects] [devtools] archrelease and slow `svn copy`
by Lukas Fleischer 24 Aug '11

24 Aug '11

Not sure if this has already been discussed elsewhere. All, some or none of you might have noticed that archrelease became way slower with some of the recent commits (probably mainly 8384ad84, didn't research in detail). My guess is that this is caused by doing a WC -> WC copy (see `svn copy --help` for details) instead of creating a simple tag which is insanely slow. If you're interested in details, check [1] and [2]. Possible solutions that I can think of: * Do not `svn copy` but just remove and copy the files. That way, we could keep the single commit but would lose history. Sucks badly. * Create simple tags [3] using the "URL -> URL" version of `svn copy`. Damned fast, but we'd have to use separate commits to remove the previous tag and re-create a tag based on trunk. Basically revert what Dan did in 8384ad849dfe308ed3e63e252785b9a6f80474f5 [4]. * Use versioned tags. Branch support in subversion sucks. * Switch to something saner than subversion. * Accept the fact that fast-forwarding branches in subversion is slow and so is archrelease. Any opinions/other suggestions? [1] http://svn.haxx.se/users/archive-2005-03/0458.shtml [2] http://svnbook.red-bean.com/en/1.5/svn.branchmerge.tags.html#svn.branchmerg… [3] http://svnbook.red-bean.com/en/1.5/svn.branchmerge.tags.html#svn.branchmerg… [4] http://projects.archlinux.org/devtools.git/commit/?id=8384ad84

1 0

[arch-projects] [devtools] [PATCH 1/5] checkpkg: Proper quoting, use double brackets
by Lukas Fleischer 24 Aug '11

24 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- checkpkg | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/checkpkg b/checkpkg index c0b2ceb..ddc14dd 100755 --- a/checkpkg +++ b/checkpkg @@ -1,7 +1,7 @@ #!/bin/bash # Source makepkg.conf; fail if it is not found -if [ -r '/etc/makepkg.conf' ]; then +if [[ -r '/etc/makepkg.conf' ]]; then source '/etc/makepkg.conf' else echo '/etc/makepkg.conf not found!' @@ -9,86 +9,86 @@ else fi # Source user-specific makepkg.conf overrides -if [ -r ~/.makepkg.conf ]; then +if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi strip_url() { - echo $1 | sed 's|^.*://.*/||g' + echo "$1" | sed 's|^.*://.*/||g' } -if [ ! -f PKGBUILD ]; then +if [[ ! -f PKGBUILD ]]; then echo 'This must be run in the directory of a built package.' exit 1 fi . PKGBUILD -if [ "$arch" == 'any' ]; then +if [[ $arch == 'any' ]]; then CARCH='any' fi STARTDIR=$(pwd) TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) -cd $TEMPDIR +cd "$TEMPDIR" -for _pkgname in ${pkgname[@]}; do - if [ -z ${epoch} ] ; then +for _pkgname in "${pkgname[@]}"; do + if [[ -z ${epoch} ]] ; then pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} else pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT} fi - if [ -f "$STARTDIR/$pkgfile" ]; then + if [[ -f "$STARTDIR/$pkgfile" ]]; then ln -s "$STARTDIR/$pkgfile" "$pkgfile" - elif [ -f "$PKGDEST/$pkgfile" ]; then + elif [[ -f "$PKGDEST/$pkgfile" ]]; then ln -s "$PKGDEST/$pkgfile" "$pkgfile" else echo "File \"$pkgfile\" doesn't exist" exit 1 fi - tmp=$(pacman -Spdd --noconfirm $_pkgname) + tmp=$(pacman -Spdd --noconfirm "$_pkgname") - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Couldn't download previous package for $_pkgname." exit 1 fi pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev) - oldpkg=$(strip_url $pkgurl) + oldpkg=$(strip_url "$pkgurl") - if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then + if [[ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]]; then echo "The built package ($_pkgname) is the one in the repo right now!" exit 1 fi - if [ ! -f $oldpkg ]; then + if [[ ! -f $oldpkg ]]; then if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then ln -s "${pkgurl#file://}" $(basename "${pkgurl#file://}") - elif [ -f "$PKGDEST/$oldpkg" ]; then + elif [[ -f "$PKGDEST/$oldpkg" ]]; then ln -s "$PKGDEST/$oldpkg" "$oldpkg" - elif [ -f "$STARTDIR/$oldpkg" ]; then + elif [[ -f "$STARTDIR/$oldpkg" ]]; then ln -s "$STARTDIR/$oldpkg" "$oldpkg" else - wget --quiet $pkgurl + wget --quiet "$pkgurl" fi fi - bsdtar tf $oldpkg > filelist-$_pkgname-old - bsdtar tf "$pkgfile" > filelist-$_pkgname + bsdtar tf "$oldpkg" > "filelist-$_pkgname-old" + bsdtar tf "$pkgfile" > "filelist-$_pkgname" - sort -o filelist-$_pkgname filelist-$_pkgname - sort -o filelist-$_pkgname-old filelist-$_pkgname-old + sort -o "filelist-$_pkgname" "filelist-$_pkgname" + sort -o "filelist-$_pkgname-old" "filelist-$_pkgname-old" - sdiff -s filelist-$_pkgname-old filelist-$_pkgname + sdiff -s "filelist-$_pkgname-old" "filelist-$_pkgname" - if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then + if diff "filelist-$_pkgname-old" "filelist-$_pkgname" | grep '\.so' > /dev/null 2>&1; then mkdir -p pkg cd pkg bsdtar xf ../"$pkgfile" > /dev/null - for i in $(diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep '\.so' | awk '{print $2}'); do - echo "${i}: " "$(objdump -p $i | grep SONAME)" + for i in $(diff "../filelist-$_pkgname-old" "../filelist-$_pkgname" | grep \> | grep '\.so' | awk '{print $2}'); do + echo "${i}: " "$(objdump -p "$i" | grep SONAME)" done cd .. else -- 1.7.6

1 4

[arch-projects] [INITSCRIPTS][PATCH] rc.d: handle a set of options
by Sebastien Luttringer 23 Aug '11

23 Aug '11

rc.d can now take --started, --stopped, --auto, --noauto as option which help user to populate list of daemon for all actions As a corollary list command can now take a list of dameon to display All kind of arguments can be mixed to obtain the proper output. zsh and bash completion are updated Note: Output of help command exit 0 and is no more printed on stderr Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- bash-completion | 20 +++++----- rc.d | 109 ++++++++++++++++++++++++++++++++++++++----------------- zsh-completion | 5 +-- 3 files changed, 86 insertions(+), 48 deletions(-) diff --git a/bash-completion b/bash-completion index d78484e..1df229e 100644 --- a/bash-completion +++ b/bash-completion @@ -3,20 +3,20 @@ _rc_d() { local action cur prev - action="help list start stop reload restart" + actions='help list start stop reload restart' + options='--started --stopped --auto --noauto' _get_comp_words_by_ref cur prev - if ((COMP_CWORD == 1)); then - COMPREPLY=($(compgen -W "${action}" -- "$cur")) - elif [[ "$prev" == help ]]; then + _get_first_arg + if [[ -z "$arg" ]]; then + COMPREPLY=($(compgen -W "${actions} ${options}" -- "$cur")) + elif [[ "$arg" == help ]]; then COMPREPLY=() - elif [[ "$prev" == list ]]; then - ((COMP_CWORD == 2)) && COMPREPLY=($(compgen -W "started stopped" -- "$cur")) || COMPREPLY=() - elif [[ "$prev" == start ]]; then + elif [[ "$arg" == start ]]; then COMPREPLY=($(comm -23 <(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort) <(cd /run/daemons/ && compgen -f "$cur"|sort))) - elif [[ "$prev" =~ stop|restart|reload ]]; then + elif [[ "$arg" =~ stop|restart|reload ]]; then COMPREPLY=($(cd /run/daemons/ && compgen -f "$cur"|sort)) - elif ((COMP_CWORD > 1)); then - COMPREPLY=($(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort)) + else + COMPREPLY=($(compgen -W "${options} $(cd /etc/rc.d && compgen -f -X 'functions*')" -- "$cur")) fi } complete -F _rc_d rc.d diff --git a/rc.d b/rc.d index 9b0f092..907439b 100755 --- a/rc.d +++ b/rc.d @@ -4,74 +4,115 @@ NEED_ROOT=0 # this script can be run without be root . /etc/rc.conf . /etc/rc.d/functions +# print usage and exit usage() { local name=${0##*/} cat >&2 << EOF -usage: $name <action> <daemon> [daemon] ... - $name list [started|stopped] - $name help +usage: $name [options] <action> [daemons] -<daemon> is the name of a script in /etc/rc.d +options: + --started Append started daemons to the list + --stopped Append stopped dameons to the list + --auto Append autostarted daemons to the list + --noauto Append not autostarted daemons to the list + +<daemons> is space separated list of script in /etc/rc.d <action> can be a start, stop, restart, reload, status, ... WARNING: initscripts are free to implement or not the above actions. e.g: $name list - $name list started - $name help + $name list sshd gpm + $name list --started gpm $name start sshd gpm + $name stop --noauto + $name help EOF - exit 1 + exit ${1:-1} } (( $# < 1 )) && usage +# parse options +argv=$(getopt -l 'started,stopped,auto,noauto' -- '' "$@") +(( $? )) && usage +eval set -- "$argv" + +# going into script directory +cd /etc/rc.d + +# create an initial daemon list +declare -a daemons=() +while [[ "$1" != -- ]]; do + case "$1" in + --started) + for d in *; do have_daemon "$d" && ! ck_daemon "$d" && daemons+=("$d"); done + ;; + --stopped) + for d in *; do have_daemon "$d" && ck_daemon "$d" && daemons+=("$d"); done + ;; + --auto) + for d in *; do have_daemon "$d" && ! ck_autostart "$d" && daemons+=("$d"); done + ;; + --noauto) + for d in *; do have_daemon "$d" && ck_autostart "$d" && daemons+=("$d"); done + ;; + esac + shift +done + +# remove -- +shift +# get action +action=$1 +shift + +# add daemons +for daemon; do + if ! have_daemon "$daemon"; then + printf "${C_FAIL}:: ${C_DONE}Dameon script ${C_FAIL}${daemon}${C_DONE} does \ +not exist or is not executable.${C_CLEAR}\n" >&2 + exit 2 + fi + daemons+=("$daemon") +done + declare -i ret=0 -case $1 in +case $action in help) - usage - ;; + usage 0 2>&1 + ;; list) - shift - cd /etc/rc.d/ - for d in *; do - have_daemon "$d" || continue + # list take all daemons by default + [[ -z $daemons ]] && for d in *; do have_daemon "$d" && daemons+=("$d"); done + for daemon in "${daemons[@]}"; do # print running / stopped satus - if ! ck_daemon "$d"; then - [[ "$1" == stopped ]] && continue - printf "${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" + if ! ck_daemon "$daemon"; then + s_status="${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" else - [[ "$1" == started ]] && continue - printf "${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" + s_status="${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" fi # print auto / manual status - if ! ck_autostart "$d"; then - printf "${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" + if ! ck_autostart "$daemon"; then + s_auto="${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" else - printf "${C_OTHER}[${C_FAIL} ${C_OTHER}]" + s_auto="${C_OTHER}[${C_FAIL} ${C_OTHER}]" fi - printf " ${C_CLEAR}$d\n" + printf "$s_status$s_auto${C_CLEAR} $daemon\n" done ;; *) # check min args count - (( $# < 2 )) && usage - action=$1 - shift + [[ -z $daemons ]] && usage # set same environment variables as init runlevel=$(/sbin/runlevel) - ENV=("PATH=/bin:/usr/bin:/sbin:/usr/sbin" + ENV=('PATH=/bin:/usr/bin:/sbin:/usr/sbin' "PREVLEVEL=${runlevel%% *}" "RUNLEVEL=${runlevel##* }" "CONSOLE=${CONSOLE:-/dev/console}" "TERM=$TERM") cd / - for i; do - if [[ -x "/etc/rc.d/$i" ]]; then - env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" - else - printf "${C_FAIL}:: ${C_DONE}Daemon ${C_FAIL}$i${C_DONE} does not exist \ -or is not executable${C_CLEAR}\n" - fi + for daemon in "${daemons[@]}"; do + env -i "${ENV[@]}" "/etc/rc.d/$daemon" "$action" (( ret += !! $? )) # clamp exit value to 0/1 done ;; diff --git a/zsh-completion b/zsh-completion index e5c2850..69b3896 100644 --- a/zsh-completion +++ b/zsh-completion @@ -4,7 +4,7 @@ _rc.d () { local curcontext="$curcontext" state line typeset -A opt_args - _arguments "1: :->action" "*: :->service" + _arguments "1: :->action" "*: :->service" "--started" "--stopped" "--auto" "--noauto" case $state in action) @@ -18,9 +18,6 @@ _rc.d () { help) _arguments "*: :" ;; - list) - _arguments "2: :(started stopped)" - ;; start) _arguments "*: :($(comm -23 <(echo /etc/rc.d/*(N-*:t)|tr ' ' '\n') <(echo /run/daemons/*(N:t)|tr ' ' '\n')))" ;; -- Sebastien "Seblu" Luttringer

3 3

[arch-projects] [INITSCRIPTS][PATCH] rc.d: list [started|stopped|auto|noauto|daemon]
by Sebastien Luttringer 23 Aug '11

23 Aug '11

list command can take new arguments auto/noauto. list command can take a list of daemon to list. All kind of arguments can be mixed to obtain the proper output. zsh and bash completion are updated Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- bash-completion | 2 +- rc.d | 71 ++++++++++++++++++++++++++++++++++++++---------------- zsh-completion | 2 +- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/bash-completion b/bash-completion index d78484e..718df6d 100644 --- a/bash-completion +++ b/bash-completion @@ -10,7 +10,7 @@ _rc_d() elif [[ "$prev" == help ]]; then COMPREPLY=() elif [[ "$prev" == list ]]; then - ((COMP_CWORD == 2)) && COMPREPLY=($(compgen -W "started stopped" -- "$cur")) || COMPREPLY=() + COMPREPLY=($(compgen -W "started stopped auto noauto $(cd /etc/rc.d && compgen -f -X 'functions*')" -- "$cur")) elif [[ "$prev" == start ]]; then COMPREPLY=($(comm -23 <(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort) <(cd /run/daemons/ && compgen -f "$cur"|sort))) elif [[ "$prev" =~ stop|restart|reload ]]; then diff --git a/rc.d b/rc.d index 3d34edf..81a07eb 100755 --- a/rc.d +++ b/rc.d @@ -4,11 +4,12 @@ NEED_ROOT=0 # this script can be run without be root . /etc/rc.conf . /etc/rc.d/functions +# print usage and exit usage() { local name=${0##*/} cat >&2 << EOF usage: $name <action> <daemon> [daemon] ... - $name list [started|stopped] + $name list [started|stopped|auto|noauto|daemon] $name help <daemon> is the name of a script in /etc/rc.d @@ -17,40 +18,68 @@ WARNING: initscripts are free to implement or not the above actions. e.g: $name list $name list started + $name list sshd gpm $name help $name start sshd gpm EOF exit 1 } +# list action +list() { + local mode s_status s_auto + local -a daemons + # parse arguments + for p; do + case "$p" in + started) mode=started;; + stopped) mode=stopped;; + auto) mode=auto;; + noauto) mode=noauto;; + *) daemons=(${daemons[@]} "$p");; + esac + done + # if no daemon are specified take all executable file in /etc/rc.d + if ! [[ $daemons ]]; then + cd /etc/rc.d + for d in *; do + [[ -x "$d" && ! -d "$d" ]] && daemons=(${daemons[@]} "$d") + done + fi + # building string to display + for d in "${daemons[@]}"; do + # check if d is a valid daemon name + have_daemon "$d" || continue + # print running / stopped satus + if ! ck_daemon "$d"; then + [[ $mode == stopped ]] && continue + s_status="${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" + else + [[ $mode == started ]] && continue + s_status="${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" + fi + # print auto / manual status + if ! ck_autostart "$d"; then + [[ $mode == noauto ]] && continue + s_auto="${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" + else + [[ $mode == auto ]] && continue + s_auto="${C_OTHER}[${C_FAIL} ${C_OTHER}]" + fi + printf "$s_status$s_auto${C_CLEAR} $d\n" + done +} + (( $# < 1 )) && usage declare -i ret=0 case $1 in help) usage - ;; + ;; list) shift - cd /etc/rc.d/ - for d in *; do - have_daemon "$d" || continue - # print running / stopped satus - if ! ck_daemon "$d"; then - [[ "$1" == stopped ]] && continue - printf "${C_OTHER}[${C_DONE}STARTED${C_OTHER}]" - else - [[ "$1" == started ]] && continue - printf "${C_OTHER}[${C_FAIL}STOPPED${C_OTHER}]" - fi - # print auto / manual status - if ! ck_autostart "$d"; then - printf "${C_OTHER}[${C_DONE}AUTO${C_OTHER}]" - else - printf "${C_OTHER}[${C_FAIL} ${C_OTHER}]" - fi - printf " ${C_CLEAR}$d\n" - done + list "$@" ;; *) # check min args count diff --git a/zsh-completion b/zsh-completion index e5c2850..b324e5c 100644 --- a/zsh-completion +++ b/zsh-completion @@ -19,7 +19,7 @@ _rc.d () { _arguments "*: :" ;; list) - _arguments "2: :(started stopped)" + _arguments "*: :(started stopped auto noauto $(echo /etc/rc.d/*(N-*:t)))" ;; start) _arguments "*: :($(comm -23 <(echo /etc/rc.d/*(N-*:t)|tr ' ' '\n') <(echo /run/daemons/*(N:t)|tr ' ' '\n')))" -- Sebastien "Seblu" Luttringer

5 6

[arch-projects] [INITSCRIPTS][PATCH 1/4] Let background daemons show errors on stderr
by Sebastien Luttringer 23 Aug '11

23 Aug '11

Daemon running in background should let error output to be printed. Standart output is still hided to have a correct printing in default cases. This will help to detect error in daemon runned in background. This will also remove have_daemon call which is already called in start_daemon. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index f68c088..eaa1374 100644 --- a/functions +++ b/functions @@ -218,7 +218,7 @@ ck_depends() { start_daemon_bkgd() { stat_bkgd "Starting $1" - have_daemon "$1" && (start_daemon "$1") &>/dev/null & + (start_daemon "$1") >/dev/null & } stop_daemon() { -- Sebastien "Seblu" Luttringer

4 10

[arch-projects] [devtools] [PATCH] archrelease: Copy new files from trunk
by Lukas Fleischer 21 Aug '11

21 Aug '11

Currently, files that have just been added to trunk are not copied to the repositories when invoking archrelease, as `svn ls` does not list them if we don't `svn update` explicitly before. Use `svn ls -r HEAD` to include everything from current HEAD. Fixes FS#25680. Reported-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Pierre, note that this one is based on my recent refactoring patches. You should push them before pushing this one. Let me know if you don't plan to do so and I'll rebase this one :) Oh, and by the way: SVN sucks :) archrelease | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archrelease b/archrelease index 287c5e7..2ca0b95 100755 --- a/archrelease +++ b/archrelease @@ -30,7 +30,7 @@ if [[ $(svn status -q) ]]; then fi pushd .. >/dev/null -IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk") +IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "trunk") for file in "${known_files[@]}"; do if [[ ${file:(-1)} = '/' ]]; then abort "archrelease: subdirectories are not supported in package directories!" -- 1.7.6

1 2

[arch-projects] [devtools] [PATCH 1/4] archrelease: Remove redundant directory check
by Lukas Fleischer 20 Aug '11

20 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- archrelease | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/archrelease b/archrelease index af75b8f..ec7545e 100755 --- a/archrelease +++ b/archrelease @@ -37,14 +37,9 @@ if [[ -d repos/$1 ]]; then trash+=("repos/$1/$file") done < <(svn ls "repos/$1") svn rm -q "${trash[@]}" -fi -if [[ ! -d repos ]]; then - mkdir repos - svn add -q repos -fi -if [[ ! -d "repos/$1" ]]; then - mkdir "repos/${1}" - svn add -q "repos/${1}" +else + mkdir -p "repos/${1}" + svn add --parents -q "repos/${1}" fi IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk") for file in "${known_files[@]}"; do -- 1.7.6

2 7

[arch-projects] [PATCH] Clean up more ANSI codes from /var/log/boot (close FS#25682)
by Eric Bélanger 20 Aug '11

20 Aug '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index bd05fa8..f68c088 100644 --- a/functions +++ b/functions @@ -435,7 +435,7 @@ bootlogd_stop() { kill $(< /run/bootlogd.pid) rm -f /run/bootlogd.pid sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \ - -e 's/\^\[(\[151|%)G//g' /var/log/boot + -e 's/\^\[(\[1[0-9]1|%)G//g' -e 's/\^\[\[0;1//g' /var/log/boot } ############################### -- 1.7.6

3 4