From 13c837597d736366be5370cd6cdbcc5df94bf351 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 12 Jun 2015 19:12:28 +0200
Subject: Node name is second arg, not third.

---
 catlfish-dev/merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh
index 9ca4d69..7d9e9fe 100755
--- a/catlfish-dev/merge.sh
+++ b/catlfish-dev/merge.sh
@@ -1,10 +1,10 @@
 #! /bin/sh
 
 LOGNAME=$1
-NODENAME=$3
+NODENAME=$2
 
-[ -z "$NODENAME" ] && NODENAME=merge
 [ -z "$LOGNAME" ] && LOGNAME=catlfish
+[ -z "$NODENAME" ] && NODENAME=merge
 [ -z "$MERGE_DB_DIR" ] && MERGE_DB_DIR=merge-db
 [ -z "$MERGE_INTERVAL_FIRST" ] && MERGE_INTERVAL_FIRST=60
 [ -z "$MERGE_INTERVAL_FREQ" ] && MERGE_INTERVAL_FREQ=3600
-- 
cgit v1.1