archrelease: remove extra SVN commit
This relies on the fact that trunk/ never has any subdirectories, so we can simply copy all the files in it to the relevant repos/xxx/ directory after removing all existing files in that directory. Signed-off-by: Dan McGee <dan@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
parent
1febb47b2c
commit
8384ad849d
27
archrelease
27
archrelease
|
@ -9,14 +9,18 @@ if [ "$1" = '' ]; then
|
||||||
abort 'Usage: archrelease <repo>'
|
abort 'Usage: archrelease <repo>'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# TODO: validate repo is really repo-arch
|
||||||
|
|
||||||
if [ ! -f PKGBUILD ]; then
|
if [ ! -f PKGBUILD ]; then
|
||||||
abort 'archrelease: PKGBUILD not found'
|
abort 'archrelease: PKGBUILD not found'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
trunk=$(basename $(pwd))
|
trunk=$(basename $(pwd))
|
||||||
|
|
||||||
|
# Normally this should be trunk, but it may be something
|
||||||
|
# such as 'gnome-unstable'
|
||||||
if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
|
if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
|
||||||
abort 'archrelease: Not in a package trunk dir'
|
abort 'archrelease: Should not be in repos dir (try from trunk/)'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z "$(svn status -q)" ]; then
|
if [ ! -z "$(svn status -q)" ]; then
|
||||||
|
@ -26,14 +30,27 @@ fi
|
||||||
echo -n "releasing package to ${1}..."
|
echo -n "releasing package to ${1}..."
|
||||||
pushd .. >/dev/null
|
pushd .. >/dev/null
|
||||||
if [ -d "repos/${1}" ]; then
|
if [ -d "repos/${1}" ]; then
|
||||||
svn rm --force -q "repos/${1}"
|
for file in $(svn ls "repos/${1}"); do
|
||||||
svn commit -q -m "archrelease: remove ${1}" || abort
|
svn rm -q "$file"
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
if [ ! -d repos ]; then
|
if [ ! -d repos ]; then
|
||||||
mkdir repos
|
mkdir repos
|
||||||
svn add repos
|
svn add repos
|
||||||
fi
|
fi
|
||||||
svn copy -q -r HEAD "${trunk}" "repos/${1}"
|
if [ ! -d "repos/${1}" ]; then
|
||||||
svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort
|
mkdir "repos/${1}"
|
||||||
|
svn add "repos/${1}"
|
||||||
|
fi
|
||||||
|
known_files=$(svn ls "trunk")
|
||||||
|
for file in $known_files; do
|
||||||
|
if [ "$file" != "${file%/}" ]; then
|
||||||
|
abort "archrelease: subdirectories are not supported in package directories!"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for file in $known_files; do
|
||||||
|
svn copy -q -r HEAD "trunk/$file" "repos/${1}/"
|
||||||
|
done
|
||||||
|
svn commit -q -m "archrelease: copy trunk to ${1}" || abort
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
echo 'done'
|
echo 'done'
|
||||||
|
|
Loading…
Reference in New Issue