X-Git-Url: https://git.armaanb.net/?p=bin.git;a=blobdiff_plain;f=web-update-server;h=2c36d71009d06ae382d18ea15b310782ca7a4fbe;hp=58fa98e452c4a0395ebd81d91e7c951c1c4c5ed5;hb=de04de76b18b76b616d813cfa00b118a3ea2d39b;hpb=4e34cf95bd71d23ee65cbe43705e4b7954b05ea3 diff --git a/web-update-server b/web-update-server index 58fa98e..2c36d71 100755 --- a/web-update-server +++ b/web-update-server @@ -5,14 +5,13 @@ set -e gitrun() { git -C $dir reset --hard - git -C $dir clean -fxd - git -C $dir pull origin main --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 ; bash bin/web-gen) + (cd /var/www/armaanb.net-gemini ; make) elif [[ $1 == "gopher" ]]; then dir=/var/www/armaanb.net-gopher gitrun @@ -22,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