diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-04-01 22:33:11 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-04-01 22:33:11 +0200 |
| commit | 64c65902819116d44a8890e7af686e7c2eaa828c (patch) | |
| tree | f2e7f7c2b17d2266331058f1cf530c81474abae5 /packaging/docker/catlfish-merge/merge.sh | |
| parent | 7ede3c3566a05146f79fae7235e6e4dbdb157acd (diff) | |
Run merge.sh under supervisord.
We want the log.
Diffstat (limited to 'packaging/docker/catlfish-merge/merge.sh')
| -rwxr-xr-x | packaging/docker/catlfish-merge/merge.sh | 9 |
1 files changed, 3 insertions, 6 deletions
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" |