From: Armaan Bhojwani <me@armaanb.net>
Date: Sat, 16 Jan 2021 00:18:54 +0000 (-0500)
Subject: Web-update-server: Switch to rebase pull
X-Git-Tag: v0.0.1~64
X-Git-Url: https://git.armaanb.net/?p=bin.git;a=commitdiff_plain;h=46b95c6915f6873451bf294eaf2269ee55879ebe

Web-update-server: Switch to rebase pull
---

diff --git a/web-update-server b/web-update-server
index 1a0f397..2fd0f18 100755
--- a/web-update-server
+++ b/web-update-server
@@ -1,10 +1,10 @@
 #!/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
 
 gitrun() {
   git -C $dir reset --hard
   git -C $dir clean -fxd
-  git -C $dir pull --ff-only
+  git -C $dir pull --rebase
 }
 
 if [[ $1 == "gemini" ]]; then
@@ -20,5 +20,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 ; bash bin/web-gen)
 fi