fixup! WIPdocker-merge

1 files changed, 5 insertions, 5 deletions

diff --git a/packaging/docker/catlfish-dev/start.sh b/packaging/docker/catlfish-dev/start.sh
index d6e4281..8b3697d 100755
--- a/packaging/docker/catlfish-dev/start.sh
+++ b/packaging/docker/catlfish-dev/start.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 
-role=$1; shift
-erlbase=$1; shift
-database=$1; shift
+role=$1; [ -n "$1" ] && shift
+erlbase=$1; [ -n "$1" ] && shift
+database=$1; [ -n "$1" ] && shift
 
 case $role in
-    frontend|storage|sign)
+    frontend|storage|signing)
         $erlbase/bin/run_erl \
             /var/run/catlfish/ \
             /var/run/catlfish/erlang_log/ \
@@ -15,7 +15,7 @@ case $role in
         ERL_LIBS=$erlbase/lib/catlfish-0.6.0-dev.ez/catlfish-0.6.0-dev
         ERL_LIBS=$ERL_LIBS:$erlbase/lib/lager-2.1.1.ez/lager-2.1.1
         export ERL_LIBS
-        $erlbase/merge.sh 300 3600 $database
+        $erlbase/merge.sh 60 3600 $database > merge_log/stdout 2> merge_log/stderr
         ;;
     *)
         echo "catlfish: unknown role: $role"