diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-21 10:06:06 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-21 10:06:06 +0100 |
| commit | 7ea090ea0f91bc55a99ee1574a5e0844c75ef4df (patch) | |
| tree | f9a3034269046b28ba46a4f8f9de1aaa7cf9cd5c | |
| parent | 9222c0fb1b2259e71fe166d383866756c118fd9e (diff) | |
Follow move of catlfish source.
| -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 a571b63..26e6c72 100755 --- a/catlfish-dev/merge.sh +++ b/catlfish-dev/merge.sh @@ -23,8 +23,8 @@ sleep $S1 while true; do echo "$0: merging" date - /usr/local/src/catlfish/tools/merge \ - --config /usr/local/etc/catlfish/${LOGNAME}.cfg \ + /usr/local/catlfish/src/tools/merge \ + --config ${LOGNAME}.cfg \ --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \ ${MERGE_EXTRA_ARGS} date |