inform the user of activities that might take a longer time
This commit is contained in:
parent
9e14e8691d
commit
59b7a739e8
|
@ -21,6 +21,7 @@ if [ "$(svn diff)" != "" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo -n 'releasing package...'
|
||||||
pushd .. >/dev/null
|
pushd .. >/dev/null
|
||||||
if [ -d repos/$1 ]; then
|
if [ -d repos/$1 ]; then
|
||||||
svn rm --force -q repos/$1
|
svn rm --force -q repos/$1
|
||||||
|
@ -29,3 +30,4 @@ fi
|
||||||
svn copy -q -r HEAD trunk repos/$1
|
svn copy -q -r HEAD trunk repos/$1
|
||||||
svn commit -q -m "archrelease: copy trunk to $1"
|
svn commit -q -m "archrelease: copy trunk to $1"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
|
echo 'done'
|
||||||
|
|
|
@ -63,12 +63,14 @@ if [ "$1" = "-l" ]; then
|
||||||
shift 2
|
shift 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo -n 'committing changes to trunk...'
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel
|
svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel
|
||||||
$1" || abort
|
$1" || abort
|
||||||
else
|
else
|
||||||
svn commit -q || abort
|
svn commit -q || abort
|
||||||
fi
|
fi
|
||||||
|
echo 'done'
|
||||||
|
|
||||||
for _arch in ${arch[@]}; do
|
for _arch in ${arch[@]}; do
|
||||||
for _pkgname in ${pkgname[@]}; do
|
for _pkgname in ${pkgname[@]}; do
|
||||||
|
@ -77,10 +79,11 @@ for _arch in ${arch[@]}; do
|
||||||
if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
|
if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
|
||||||
pkgfile="$PKGDEST/$pkgfile"
|
pkgfile="$PKGDEST/$pkgfile"
|
||||||
elif [ ! -f $pkgfile ]; then
|
elif [ ! -f $pkgfile ]; then
|
||||||
echo "Skipping ${_arch}"
|
echo "skipping ${_arch}"
|
||||||
continue 2
|
continue 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo -n 'uploading '
|
||||||
rsync -c -h --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
|
rsync -c -h --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
|
||||||
done
|
done
|
||||||
archrelease $repo-${_arch} || abort
|
archrelease $repo-${_arch} || abort
|
||||||
|
@ -89,9 +92,11 @@ done
|
||||||
if [ "${arch[*]}" == "any" ]; then
|
if [ "${arch[*]}" == "any" ]; then
|
||||||
if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
|
if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
|
||||||
pushd ../repos/ >/dev/null
|
pushd ../repos/ >/dev/null
|
||||||
|
echo -n "removing $repo-i686 and $repo-x86_64..."
|
||||||
svn rm $repo-i686
|
svn rm $repo-i686
|
||||||
svn rm $repo-x86_64
|
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
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -107,9 +107,10 @@ fi
|
||||||
|
|
||||||
umask 000
|
umask 000
|
||||||
if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
|
if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
|
||||||
echo "creating clean working copy"
|
echo -n 'creating clean working copy...'
|
||||||
mkdir -p "$copydir"
|
mkdir -p "$copydir"
|
||||||
rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
|
rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
|
||||||
|
echo 'done'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$install_pkg" ]; then
|
if [ -n "$install_pkg" ]; then
|
||||||
|
|
Loading…
Reference in New Issue