diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-08-22 13:59:36 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2011-08-25 11:17:19 +0200 |
| commit | 88a929cfc0e52864605660474a632d6a7f7f990b (patch) | |
| tree | 614c22b99e4e5c80fe1aa1c7ae03f516881af6a5 | |
| parent | c24209028a6c531ff731a18ab5836ad71ef7b999 (diff) | |
archrelease: Fix behaviour with non-standard trunk name
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@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
| -rwxr-xr-x | 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 |