X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=web-update-server;h=2c36d71009d06ae382d18ea15b310782ca7a4fbe;hb=885898283827a821b60b0c5c8dd6c32ba49e65be;hp=67d0ea4c884876cb9fc2e04a6e9eeb891a4f1d1f;hpb=82354a387860f0f5eb47f187f709ad08339e0802;p=bin.git diff --git a/web-update-server b/web-update-server index 67d0ea4..2c36d71 100755 --- a/web-update-server +++ b/web-update-server @@ -1,16 +1,17 @@ #!/usr/bin/env bash # Executed over SSH on builds.sr.ht for my websites +set -e + gitrun() { git -C $dir reset --hard - git -C $dir clean -fxd - git -C $dir pull --rebase + git -C $dir pull origin main --rebase } if [[ $1 == "gemini" ]]; then dir=/var/www/armaanb.net-gemini gitrun - (cd /var/www/armaanb.net-gemini ; bash bin/web-gen) + (cd /var/www/armaanb.net-gemini ; make) elif [[ $1 == "gopher" ]]; then dir=/var/www/armaanb.net-gopher gitrun @@ -20,5 +21,5 @@ elif [[ $1 == "fortune" ]]; then elif [[ $1 == "http" ]]; then dir=/var/www/armaanb.net-http gitrun - (cd /var/www/armaanb.net-http ; bash bin/web-gen) + (cd /var/www/armaanb.net-http ; make -B) fi