diff --git a/bin/run.sh b/bin/run.sh index 4540043..c76ba4c 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -101,12 +101,12 @@ svnsync() { # we don't sync vendor if the lock file is the same shasum "$SVN_PATH/trunk/composer.lock" shasum "$OUTPUT_PATH/composer.lock" - #if [[ $(shasum "$SVN_PATH/trunk/composer.lock" | head -c 40) == $(shasum "$OUTPUT_PATH/composer.lock" | head -c 40) ]]; then - # rsync -q -av --delete --delete-excluded --delete-before $OUTPUT_PATH/ $SVN_PATH/trunk --exclude vendor - # echo "## no differences in /vendor, similar lock files ##" - #else + if [[ $(shasum "$SVN_PATH/trunk/composer.lock" | head -c 40) == $(shasum "$OUTPUT_PATH/composer.lock" | head -c 40) ]]; then + rsync -q -av --delete --delete-excluded --delete-before $OUTPUT_PATH/ $SVN_PATH/trunk --exclude vendor + echo "## no differences in /vendor, similar lock files ##" + else rsync -q -av --delete --delete-excluded --delete-before $OUTPUT_PATH/ $SVN_PATH/trunk - #fi + fi (cd $SVN_PATH && svn add --force . && svn diff && svn stat) } @@ -136,10 +136,16 @@ svnpush() { exit 1 fi + # remove from svn deleted files + cd $SVN_PATH + if [ ! -z $( svn status | sed -e '/^!/!d' -e 's/^!//' ) ]; then + rm $( svn status | sed -e '/^!/!d' -e 's/^!//' ) + fi + if [ ! -z "$SVN_TAG" ]; then - cd $SVN_PATH && svn rm $( svn status | sed -e '/^!/!d' -e 's/^!//' ) && svn cp trunk tags/$SVN_TAG && svn ci -m "Version $SVN_TAG" --username $SVN_USERNAME --password $SVN_PASSWORD + cd $SVN_PATH && svn cp trunk tags/$SVN_TAG && svn ci -m "Version $SVN_TAG" --username $SVN_USERNAME --password $SVN_PASSWORD else - cd $SVN_PATH && svn rm $( svn status | sed -e '/^!/!d' -e 's/^!//' ) && svn ci -m "Sync trunk" --username $SVN_USERNAME --password $SVN_PASSWORD + cd $SVN_PATH && svn ci -m "Sync trunk" --username $SVN_USERNAME --password $SVN_PASSWORD fi }