Commit 59b7a739 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

inform the user of activities that might take a longer time

parent 9e14e869

archrelease

+2 −0
Original line number Diff line number Diff line
@@ -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'

commitpkg

+7 −2
Original line number Diff line number Diff line
@@ -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

makechrootpkg

+2 −1
Original line number Diff line number Diff line
@@ -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