From 3f2dd4e282267117c5c8deeea52d710e36e63ab8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 12 Jun 2010 14:37:34 +0000 Subject: [PATCH] 2010-06-12 16:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_nightly.sh + Added patch by Tamas Tevesz. Thank you very much. + Will now use simple cp to put nightlies in place if the scripts detects that it's run in sf.net server shell. --- harbour/ChangeLog | 6 ++++++ harbour/mpkg_nightly.sh | 28 ++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 901aa9d2f7..dcdee8c790 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-12 16:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_nightly.sh + + Added patch by Tamas Tevesz. Thank you very much. + + Will now use simple cp to put nightlies in place if + the scripts detects that it's run in sf.net server shell. + 2010-06-12 14:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_nightly.sh + Added instructions to setup unattended file upload to sf.net. diff --git a/harbour/mpkg_nightly.sh b/harbour/mpkg_nightly.sh index 80275e3062..59f91e2768 100755 --- a/harbour/mpkg_nightly.sh +++ b/harbour/mpkg_nightly.sh @@ -43,15 +43,15 @@ # http://sourceforge.net/apps/trac/sourceforge/wiki/SSH%20keys # -[ -n harbour-nightly-src.zip ] || rm harbour-nightly-src.zip -[ -n harbour-nightly.tar.bz2 ] || rm harbour-nightly.tar.bz2 -[ -n harbour-nightly.tar.gz ] || rm harbour-nightly.tar.gz +rm -f harbour-nightly-src.zip harbour-nightly.tar.bz2 harbour-nightly.tar.gz rm -f -r _mk_nightly -mkdir _mk_nightly +mkdir _mk_nightly || { + echo "Failed to create _mk_nightly" + exit 1 +} cd _mk_nightly -rm -f -r harbour svn export --native-eol LF http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour tar -c harbour/* > harbour-nightly.tar bzip2 -c -z harbour-nightly.tar > ../harbour-nightly.tar.bz2 @@ -65,6 +65,18 @@ zip -X -r -o ../harbour-nightly-src.zip harbour/* cd .. rm -f -r _mk_nightly -scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly-src.zip $HB_SFNET_USER,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/source/nightly/ -scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.bz2 $HB_SFNET_USER,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/source/nightly/ -scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.gz $HB_SFNET_USER,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/source/nightly/ +destdir="/home/frs/project/h/ha/harbour-project/source/nightly/" + +if [ -d $destdir ] + echo cp harbour-nightly-src.zip $destdir + echo cp harbour-nightly.tar.bz2 $destdir + echo cp harbour-nightly.tar.gz $destdir +then + if [ "$HB_SFNET_FRS_PRIVATE_KEY" -a "$HB_SFNET_USER" ] + then + desthost=",harbour-project@frs.sourceforge.net:" + scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly-src.zip $HB_SFNET_USER,$desthost$destdir + scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.bz2 $HB_SFNET_USER,$desthost$destdir + scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.gz $HB_SFNET_USER,$desthost$destdir + fi +fi