From: Armaan Bhojwani <me@armaanb.net>
Date: Wed, 3 Feb 2021 20:20:38 +0000 (-0500)
Subject: Web-update-server: don't clean before rebase pull
X-Git-Tag: v0.0.1~46
X-Git-Url: https://git.armaanb.net/?p=bin.git;a=commitdiff_plain;h=de19adb392eb02bd0ad0ef75ddf8ae2e7f5748ce

Web-update-server: don't clean before rebase pull
---

diff --git a/web-update-server b/web-update-server
index 23f782a..2c36d71 100755
--- a/web-update-server
+++ b/web-update-server
@@ -5,8 +5,7 @@ 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
@@ -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 ; make)
+  (cd /var/www/armaanb.net-http ; make -B)
 fi