diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-08-31 18:41:26 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-08-31 18:41:26 +0000 |
commit | a903d6d96a4174e255ea08be4d7feade26fb8440 (patch) | |
tree | 520bb0a12fc25a03f76da5d65fc315ebec2304a2 /scripts/auto-build/auto-build-common | |
parent | b4ef04a54868e37e774e79af349dda7adab25f4e (diff) |
update directly from git and svn servers, rather than rsyncing
svn path=/trunk/; revision=16186
Diffstat (limited to 'scripts/auto-build/auto-build-common')
-rw-r--r-- | scripts/auto-build/auto-build-common | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index f76c683f..bfc0a671 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -28,11 +28,11 @@ fi ## another possibility is to set the "RECIPIENT" environmental variable before running ## the autobuilder -if [ -e ${SCRIPT_DIR}/auto-build-common.local ]; then - . ${SCRIPT_DIR}/auto-build-common.local +if [ -e ${HOME}/auto-build-common.local ]; then + . ${HOME}/auto-build-common.local else - echo "Could not find local configuration in \"${SCRIPT_DIR}/auto-build-common.local\"" - echo "Skipping... (see ${SCRIPT_DIR}/auto-build-common for instructions)" + echo "Could not find local configuration in \"${HOME}/auto-build-common.local\"" + echo "Skipping... (see ${HOME}/auto-build-common for instructions)" echo fi @@ -78,3 +78,20 @@ rsync_distro() ;; esac } + +clean_and_update_folder() +{ + folder=$1 + cd $folder + if [ -d $folder/.git ]; then + git reset --hard + git clean -fdx + git pull + elif [ -d $folder/.svn ]; then + svn revert -R . + svn status --no-ignore | awk '{print $2}' | xargs rm -rf + svn update + else + echo "no cleaning done, unknown SCM" + fi +} |