summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcatlfish-dev/merge.sh4
1 files 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