Status: switch from upower to acpi

[bin.git] / web-update-server

diff --git a/web-update-server b/web-update-server
index 2fd0f1831da7650f0b04fd1e995aaf1f19357c5a..23f782a1c4b2a0ce4558077c8f62cccddf8ac5f3 100755 (executable)
--- a/web-update-server
+++ b/web-update-server
@@ -1,16 +1,18 @@
 #!/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 --ff-only 
 }
 
 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 +22,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)
 fi