diff options
author | Linus Nordberg <linus@nordu.net> | 2015-11-19 15:47:55 +0100 |
---|---|---|
committer | Linus Nordberg <linus@nordu.net> | 2015-11-19 15:47:55 +0100 |
commit | 6bedbcb21d20dd4e5ccbf4a446508a51f6b757c6 (patch) | |
tree | 362659dd75ab69ee42be3542a460508e1b10c1da | |
parent | c33fb0a07ae4b55cbf97a4bae0d434660eb2fc68 (diff) |
merge.py is gone, long live merge.
-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 |