X-Git-Url: https://git.armaanb.net/?p=bin.git;a=blobdiff_plain;f=web-update-server;h=2c36d71009d06ae382d18ea15b310782ca7a4fbe;hp=2fd0f1831da7650f0b04fd1e995aaf1f19357c5a;hb=6798937faee881869fa22a839d8db26aa7ff2b40;hpb=46b95c6915f6873451bf294eaf2269ee55879ebe diff --git a/web-update-server b/web-update-server index 2fd0f18..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 ; python3 mdconvert.py) + (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