diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-06-12 19:12:28 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-06-12 19:12:28 +0200 |
| commit | 13c837597d736366be5370cd6cdbcc5df94bf351 (patch) | |
| tree | adfe28670b7b78e098b5399cf391749b1682d4ad /catlfish-dev/merge.sh | |
| parent | 6525c3517ba47195dc2790c9a7ec5e546e672c6a (diff) | |
Node name is second arg, not third.
Diffstat (limited to 'catlfish-dev/merge.sh')
| -rwxr-xr-x | catlfish-dev/merge.sh | 4 |
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 |