Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2010-02-13 04:03:10 +0100
committerPierre Schmitz <pierre@archlinux.de>2010-02-13 04:03:10 +0100
commit59b7a739e8436d02136bd6483115f23fe19860e0 (patch)
tree32606e6aadc1a868a13e7d306fab6c9e511902df
parent9e14e8691d6b60d82ab553252a79cc5e61e2d40d (diff)
inform the user of activities that might take a longer time0.9.1
-rwxr-xr-xarchrelease2
-rwxr-xr-xcommitpkg9
-rwxr-xr-xmakechrootpkg3
3 files changed, 11 insertions, 3 deletions
diff --git a/archrelease b/archrelease
index 7898735..e92a76f 100755
--- a/archrelease
+++ b/archrelease
@@ -21,6 +21,7 @@ if [ "$(svn diff)" != "" ]; then
exit 1
fi
+echo -n 'releasing package...'
pushd .. >/dev/null
if [ -d repos/$1 ]; then
svn rm --force -q repos/$1
@@ -29,3 +30,4 @@ fi
svn copy -q -r HEAD trunk repos/$1
svn commit -q -m "archrelease: copy trunk to $1"
popd >/dev/null
+echo 'done'
diff --git a/commitpkg b/commitpkg
index e8525ee..54784e1 100755
--- a/commitpkg
+++ b/commitpkg
@@ -63,12 +63,14 @@ if [ "$1" = "-l" ]; then
shift 2
fi
+echo -n 'committing changes to trunk...'
if [ -n "$1" ]; then
svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel
$1" || abort
else
svn commit -q || abort
fi
+echo 'done'
for _arch in ${arch[@]}; do
for _pkgname in ${pkgname[@]}; do
@@ -77,10 +79,11 @@ for _arch in ${arch[@]}; do
if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
pkgfile="$PKGDEST/$pkgfile"
elif [ ! -f $pkgfile ]; then
- echo "Skipping ${_arch}"
+ echo "skipping ${_arch}"
continue 2
fi
+ echo -n 'uploading '
rsync -c -h --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
done
archrelease $repo-${_arch} || abort
@@ -89,9 +92,11 @@ done
if [ "${arch[*]}" == "any" ]; then
if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
pushd ../repos/ >/dev/null
+ echo -n "removing $repo-i686 and $repo-x86_64..."
svn rm $repo-i686
svn rm $repo-x86_64
- svn commit -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+ svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+ echo 'done'
popd >/dev/null
fi
fi
diff --git a/makechrootpkg b/makechrootpkg
index d8e03ba..e1fab77 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -107,9 +107,10 @@ fi
umask 000
if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
- echo "creating clean working copy"
+ echo -n 'creating clean working copy...'
mkdir -p "$copydir"
rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+ echo 'done'
fi
if [ -n "$install_pkg" ]; then