From 6bedbcb21d20dd4e5ccbf4a446508a51f6b757c6 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Thu, 19 Nov 2015 15:47:55 +0100
Subject: merge.py is gone, long live merge.

---
 catlfish-dev/merge.sh | 8 ++++----
 1 file 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
-- 
cgit v1.1