X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update-all;h=e55aa84ccf3e958491e0fd1694b6336b5aa4c246;hb=HEAD;hp=d5415db371e7186fd950377baec189204fdd1dc2;hpb=5a0390e3aa44d4c68dce59a4218812f447c7a0e0;p=phdru.name%2Fphdru.name.git diff --git a/update-all b/update-all index d5415db..e55aa84 100755 --- a/update-all +++ b/update-all @@ -1,11 +1,10 @@ #! /bin/sh -cd ../htdocs/phdru.name && \ +git diff --quiet web/master master || +git push web master || exit 1 -ssh -4 phdppru@phdru.name 'cd public_html && exec mv .htaccess awstats cgi-bin "$HOME"/tmp' && \ -distribute -d public_html && \ -ssh -4 phdppru@phdru.name "cd tmp && exec mv .htaccess awstats cgi-bin ../public_html" && \ +cd "`dirname \"$0\"`"/.. && +distribute -aD phdru.name && -ssh -4 iskra-aviel.phdru.name sitecopy -u fatal.ru && \ -cd "$HOME" && rsync -aPz4 iskra-aviel.phdru.name:.sitecopy . && \ -exec distribute .sitecopy +cd htdocs && +exec distribute -aD git.phdru.name phdru.name