diff --git a/bin/run.sh b/bin/run.sh index 980b993..56dad26 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -101,14 +101,15 @@ 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 $OUTPUT_PATH/* $SVN_PATH/trunk --exclude vendor - echo "## no differences in /vendor, similar lock files ##" - else - rsync -q -av $OUTPUT_PATH/* $SVN_PATH/trunk - fi - + #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 + tree -L 3 "$SVN_PATH" (cd $SVN_PATH && svn add --force . && svn diff && svn stat) + tree -L 3 "$SVN_PATH" } svnpush() {