From 64c65902819116d44a8890e7af686e7c2eaa828c Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 1 Apr 2015 22:33:11 +0200
Subject: Run merge.sh under supervisord.

We want the log.
---
 packaging/docker/catlfish-merge/merge.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'packaging/docker/catlfish-merge/merge.sh')

diff --git a/packaging/docker/catlfish-merge/merge.sh b/packaging/docker/catlfish-merge/merge.sh
index f1f3b5c..978698c 100755
--- a/packaging/docker/catlfish-merge/merge.sh
+++ b/packaging/docker/catlfish-merge/merge.sh
@@ -8,12 +8,9 @@ S2=1200; [ -n "$2" ] && S2=$2
 
 DBDIR="$3"
 
-if ! [ -d "$DBDIR" ]; then
-    rm -rf $DBDIR
-    mkdir $DBDIR
-    mkdir $DBDIR/chains
-    touch $DBDIR/logorder
-fi
+[ -d "$DBDIR" ] || mkdir $DBDIR
+[ -d $DBDIR/chains ] || mkdir $DBDIR/chains
+[ -e $DBDIR/logorder ] || touch $DBDIR/logorder
 
 date
 echo "merge: waiting $(expr $S1 / 60)m$(expr $S1 % 60)s before merging for the first time"
-- 
cgit v1.1