From 5b90e6cc436806396537c689d1c1a469ced9c75b Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 21 Feb 2017 13:14:39 +0100
Subject: Parameterise -boot argument to run_erl.

Less duplication.
---
 catlfish-dev/start.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index f28b367..9265210 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -22,10 +22,7 @@ ln -s ${nodename}/${nodename}.config
 
 case $role in
     frontend|storage|signing)
-        $erlbase/bin/run_erl \
-            /var/run/catlfish/ \
-            /var/run/catlfish/erlang_log/ \
-            "exec $erlbase/bin/erl -config $nodename"
+        boot=catlfish
         ;;
 
     merge)
@@ -33,12 +30,16 @@ case $role in
         $erlbase/merge.sh ${logname} ${nodename} \
                           > merge_log/stdout \
                           2> merge_log/stderr &
-        $erlbase/bin/run_erl \
-            /var/run/catlfish/ \
-            /var/run/catlfish/erlang_log/ \
-            "exec $erlbase/bin/erl -boot merge -config $nodename"
+        boot=merge
         ;;
+
     *)
         echo "catlfish: unknown role: $role"
+        exit 1
         ;;
 esac
+
+$erlbase/bin/run_erl \
+    /var/run/catlfish/ \
+    /var/run/catlfish/erlang_log/ \
+    "exec $erlbase/bin/erl -boot $boot -config $nodename"
-- 
cgit v1.1