Use getconfig.sh and run new Erlang based merge too.

1 files changed, 11 insertions, 24 deletions

diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index bf7b129..f28b367 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -11,21 +11,17 @@ erlbase=$ERLANG_BASE_DIR
 # Use some reasonable default values.
 [ -z "$erlbase" ] && erlbase=/usr/local/catlfish
 
-# FIXME: Get compileconfig.py from the
+# FIXME: Get getconfig.sh from the
 # $erlbase/lib/catlfish-$VERSION.ez (zip archive) instead of requiring
 # source code to be unpacked in the container.
-COMPILECONFIG=/usr/local/src/catlfish/tools/compileconfig.py
+GETCONFIG=/usr/local/catlfish/src/tools/getconfig.sh
+
+mkdir ${nodename}
+$GETCONFIG /usr/local/etc/catlfish/${nodename}.cfg ${logname}.cfg force-compile
+ln -s ${nodename}/${nodename}.config
 
 case $role in
     frontend|storage|signing)
-        if [ -f /usr/local/etc/catlfish/${nodename}.config ]; then
-	    ln -s /usr/local/etc/catlfish/${nodename}.config
-        else
-	    mkdir ${nodename}
-            $COMPILECONFIG --config /usr/local/etc/catlfish/${logname}.cfg \
-                           --localconfig /usr/local/etc/catlfish/${nodename}.cfg;
-	    ln -s ${nodename}/${nodename}.config
-        fi
         $erlbase/bin/run_erl \
             /var/run/catlfish/ \
             /var/run/catlfish/erlang_log/ \
@@ -33,23 +29,14 @@ case $role in
         ;;
 
     merge)
-        # Module versions are included in the filename of the module
-        # archive file and in the filename within the
-        # archive. Example: lib/catlfish-0.8.0-dev.ez contains
-        # catlfish-0.8.0-dev.
-        ver=$(ls $erlbase/lib/catlfish-*.ez | sed 's/.*catlfish-\(.*\)\.ez/\1/1')
-        ERL_LIBS=$erlbase/lib/catlfish-${ver}.ez/catlfish-${ver}
-        ver=$(ls $erlbase/lib/plop-*.ez | sed 's/.*plop-\(.*\)\.ez/\1/1')
-        ERL_LIBS=$ERL_LIBS:$erlbase/lib/plop-${ver}.ez/plop-${ver}
-        ver=$(ls $erlbase/lib/lager-*.ez | sed 's/.*lager-\(.*\)\.ez/\1/1')
-        ERL_LIBS=$ERL_LIBS:$erlbase/lib/lager-${ver}.ez/lager-${ver}
-        export ERL_LIBS
-
 	[ -z "${MERGE_DB_DIR}" ] && MERGE_DB_DIR=merge-db
-
         $erlbase/merge.sh ${logname} ${nodename} \
                           > merge_log/stdout \
-                          2> merge_log/stderr
+                          2> merge_log/stderr &
+        $erlbase/bin/run_erl \
+            /var/run/catlfish/ \
+            /var/run/catlfish/erlang_log/ \
+            "exec $erlbase/bin/erl -boot merge -config $nodename"
         ;;
     *)
         echo "catlfish: unknown role: $role"