X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=web-update-server;h=2c36d71009d06ae382d18ea15b310782ca7a4fbe;hb=3782ac5ae65c6c8d13a6552597e03be5a4782d7c;hp=1a0f397683ef8224d033162d2beeacf4e5b2051c;hpb=f2fd615b38847e5b452685a67bd7ab7863da3c0d;p=bin.git diff --git a/web-update-server b/web-update-server index 1a0f397..2c36d71 100755 --- a/web-update-server +++ b/web-update-server @@ -1,16 +1,17 @@ #!/usr/bin/env bash -# Executed over ssh on sr.ht CI/CD for my websites +# 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 --ff-only + 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 rss-gen) + (cd /var/www/armaanb.net-http ; make -B) fi