diff --git a/.githooks/pre-push b/.githooks/pre-push index d97223c..5617958 100755 --- a/.githooks/pre-push +++ b/.githooks/pre-push @@ -4,7 +4,7 @@ # created: 2023-03-26T23:27:11+0200 clean_up () { - echo -n ">>> Removing output files..." + echo -en "\n>>> Removing output files..." rm -rf public if [ "$?" -eq "0" ]; then echo " Success!" @@ -13,9 +13,16 @@ clean_up () { echo "Could not delete output files (public). Aborting..." exit 1 fi + echo } -echo -n ">>> Creating static files with `hugo version | awk '{ print $1,$2 }'`..." +# git lfs +echo -n ">>> Check for git-lfs..." +command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; } +git lfs pre-push "$@" +echo " Done!" + +echo -en "\n>>> Creating static files with `hugo version | awk '{ print $1,$2 }'` (oe7drt.com)..." ret="$(hugo --gc --minify --printPathWarnings --logLevel warn)" @@ -30,26 +37,7 @@ else exit 1 fi -# git lfs -echo -n ">>> Check for git-lfs..." -command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; } -git lfs pre-push "$@" -echo " Done!" - -# echo -n ">>> Pushing files to *bor* (old server)..." -# -# ret="$(rsync --no-motd -acvhz --stats --del public/ bor:/var/www/sites/oe7drt/ > /dev/null 2>&1)" -# -# if [ "$?" -eq "0" ] ; then -# echo " Success!" -# else -# echo " *** FAILED ***" -# echo "Could not sync files to *bor* (rsync). Aborting..." -# clean_up -# exit 1 -# fi - -echo -n ">>> Pushing files to *celeste* (new server)..." +echo -n ">>> Pushing files to *celeste* (oe7drt.com)..." ret="$(rsync --no-motd -acvhz --stats --del public/ celeste:/srv/sites/oe7drt/ > /dev/null 2>&1)" @@ -64,3 +52,35 @@ fi clean_up +# ============================================================== +# 5uxkejb6la7olhncaotybxrscmdlbxwy64ucuyrum4tsgfuoxbyav2qd.onion + +echo -en "\n>>> Creating static files with `hugo version | awk '{ print $1,$2 }'` (onion services)..." + +ret="$(hugo --gc --minify --printPathWarnings --logLevel warn --baseURL http://5uxkejb6la7olhncaotybxrscmdlbxwy64ucuyrum4tsgfuoxbyav2qd.onion/)" + +# if [ -n "$(echo $ret | grep Total)" ] ; then +if [ "$?" -eq "0" ] ; then + echo " Success!" +else + echo " *** FAILED ***" + echo "Could not create static files (hugo). Aborting..." + clean_up + # exit with 1, so the update does not proceed, so we will know + exit 1 +fi + +echo -n ">>> Pushing files to *celeste* (onion services)..." + +ret="$(rsync --no-motd -acvhz --stats --del public/ celeste:/srv/sites/oe7drt-onion/ > /dev/null 2>&1)" + +if [ "$?" -eq "0" ] ; then + echo " Success!" +else + echo " *** FAILED ***" + echo "Could not sync files to *celeste* (rsync). Aborting..." + clean_up + exit 1 +fi + +clean_up