Make messages uniform. Also, stop calling repositories "server", and display the repository for more transparency. Signed-off-by: Linus Arver <linusarver@gmail.com> --- prototypes/PKGBUILD-bzr.proto | 4 ++-- prototypes/PKGBUILD-cvs.proto | 5 +++-- prototypes/PKGBUILD-darcs.proto | 10 +++++----- prototypes/PKGBUILD-git.proto | 6 +++--- prototypes/PKGBUILD-hg.proto | 4 ++-- prototypes/PKGBUILD-svn.proto | 5 +++-- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index bca92f1..b412247 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -32,7 +32,7 @@ _bzrmod=MODNAME build() { cd "$srcdir" - msg "Connecting to Bazaar server...." + msg "Connecting to $_bzrtrunk ..." if [[ -d "$_bzrmod" ]]; then cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" @@ -42,7 +42,7 @@ build() { bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" fi - msg "Bazaar checkout done or server timeout" + msg "Bazaar checkout done or connection timeout" msg "Starting build..." rm -rf "$srcdir/$_bzrmod-build" diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 5c883bc..a987437 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -32,17 +32,18 @@ _cvsmod=MODNAME build() { cd "$srcdir" - msg "Connecting to $_cvsmod.sourceforge.net CVS server...." + msg "Connecting to $_cvsmod ..." if [[ -d "$_cvsmod/CVS" ]]; then cd "$_cvsmod" cvs -z3 update -d + msg "The local files are updated." cd .. else cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod" fi - msg "CVS checkout done or server timeout" + msg "CVS checkout done or connection timeout" msg "Starting build..." rm -rf "$srcdir/$_cvsmod-build" diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 28b0c32..8dd0b48 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -32,24 +32,24 @@ _darcsmod=MODNAME build() { cd "$srcdir" - msg "Checking for previous build...." + msg "Connecting to $_darcstrunk ..." if [[ -d "$_darcsmod/_darcs" ]]; then - msg "Retrieving missing patches" cd "$_darcsmod" darcs pull -a "$_darcstrunk/$_darcsmod" + msg "The local files are updated." cd .. else - msg "Retrieving complete sources" darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod" fi + msg "Darcs checkout done or connection timeout" + msg "Starting build..." + rm -rf "$srcdir/$_darcsmod-build" cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build" cd "$srcdir/$_darcsmod-build" - msg "Starting build..." - # # BUILD HERE # diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 78f3992..dd3f76e 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -28,11 +28,11 @@ noextract=() md5sums=() #generate with 'makepkg -g' _gitroot=GITURL -_gitname=MODENAME +_gitname=REPONAME build() { cd "$srcdir" - msg "Connecting to GIT server...." + msg "Connecting to $_gitroot ..." if [[ -d "$_gitname" ]]; then cd "$_gitname" && git pull origin @@ -42,7 +42,7 @@ build() { git clone "$_gitroot" "$_gitname" fi - msg "GIT checkout done or server timeout" + msg "GIT checkout done or connection timeout" msg "Starting build..." rm -rf "$srcdir/$_gitname-build" diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index e583142..38713eb 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -32,7 +32,7 @@ _hgrepo=REPONAME build() { cd "$srcdir" - msg "Connecting to Mercurial server...." + msg "Connecting to $_hgroot ..." if [[ -d "$_hgrepo" ]]; then cd "$_hgrepo" @@ -43,7 +43,7 @@ build() { hg clone "$_hgroot" "$_hgrepo" fi - msg "Mercurial checkout done or server timeout" + msg "Mercurial checkout done or connection timeout" msg "Starting build..." rm -rf "$srcdir/$_hgrepo-build" diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 2afb533..3271361 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -32,16 +32,17 @@ _svnmod=MODNAME build() { cd "$srcdir" - msg "Connecting to SVN server...." + msg "Connecting to $_svntrunk ..." if [[ -d "$_svnmod/.svn" ]]; then (cd "$_svnmod" && svn up -r "$pkgver") + msg "The local files are updated." cd .. else svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" fi - msg "SVN checkout done or server timeout" + msg "SVN checkout done or connection timeout" msg "Starting build..." rm -rf "$srcdir/$_svnmod-build" -- 1.7.7.2