From 4c50a1fc96cf0ebd3ff2092c8998bcf3f297a21c Mon Sep 17 00:00:00 2001
From: fr33domlover <fr33domlover@riseup.net>
Date: Mon, 14 Jan 2019 01:50:14 +0000
Subject: [PATCH] Turn clone-deps.sh into a safe update-deps.sh script and
 document in INSTALL.md

---
 INSTALL.md     |  8 +++++++-
 clone-deps.sh  | 16 ----------------
 update-deps.sh | 24 ++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 17 deletions(-)
 delete mode 100644 clone-deps.sh
 create mode 100644 update-deps.sh

diff --git a/INSTALL.md b/INSTALL.md
index ac0907f..863abd7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -46,7 +46,7 @@ Clone the Vervis repo:
 
 Clone dependency libraries:
 
-    $ ./clone-deps.sh
+    $ ./update-deps.sh
 
 # (5) Configuration and database
 
@@ -103,6 +103,12 @@ Build. This will also automatically install GHC.
 
 # (8) Development and deployment
 
+To update your local clone of Vervis, run:
+
+    $ darcs pull
+    $ ./update-deps.sh
+    $ stack build
+
 For convenience, at least on actual deployments, you may wish to run the Vervis
 SSH server on port 22, so that people don't have to specify a custom port. For
 that to work, the user that runs the Vervis server needs to get permission to
diff --git a/clone-deps.sh b/clone-deps.sh
deleted file mode 100644
index 4538284..0000000
--- a/clone-deps.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-VERVIS='https://dev.angeley.es/s/fr33domlover/r'
-
-mkdir -p lib
-cd lib
-darcs clone $VERVIS/hit-graph
-darcs clone $VERVIS/hit-harder
-darcs clone $VERVIS/hit-network
-darcs clone $VERVIS/darcs-lights
-darcs clone $VERVIS/darcs-rev
-darcs clone $VERVIS/ssh
-darcs clone $VERVIS/persistent-migration
-darcs clone $VERVIS/persistent-email-address
-darcs clone $VERVIS/time-interval-aeson
-darcs clone $VERVIS/yesod-mail-send
diff --git a/update-deps.sh b/update-deps.sh
new file mode 100644
index 0000000..9eebf6b
--- /dev/null
+++ b/update-deps.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+VERVIS='https://dev.angeley.es/s/fr33domlover/r'
+
+DEPS='hit-graph
+      hit-harder
+      hit-network
+      darcs-lights
+      darcs-rev
+      ssh
+      persistent-migration
+      persistent-email-address
+      time-interval-aeson
+      yesod-mail-send'
+
+mkdir -p lib
+cd lib
+for dep in $DEPS; do
+    if [ -d "$dep" ]; then
+        darcs pull --repodir="$dep"
+    else
+        darcs clone "$VERVIS/$dep"
+    fi
+done