diff options
| -rwxr-xr-x | catlfish-dev/merge.sh | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh index 4120ec2..a571b63 100755 --- a/catlfish-dev/merge.sh +++ b/catlfish-dev/merge.sh @@ -23,10 +23,10 @@ sleep $S1  while true; do      echo "$0: merging"      date -    python /usr/local/src/catlfish/tools/merge.py \ -           --config /usr/local/etc/catlfish/${LOGNAME}.cfg \ -           --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \ -           ${MERGE_EXTRA_ARGS} +    /usr/local/src/catlfish/tools/merge \ +        --config /usr/local/etc/catlfish/${LOGNAME}.cfg \ +        --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \ +        ${MERGE_EXTRA_ARGS}      date      echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again"      sleep $S2 | 
