Skip to content

Commit

Permalink
Fix compatibility issues with ctlcluster
Browse files Browse the repository at this point in the history
Motivation:

Installing another version of dCache into system-test using ctlcluster currently
only works on Mac OS X.

Modification:

- Fix use of capslock (I didn't known command names on Mac OS X are not case
  sensitive).

- Fixed sed arguments to be Linux compatible.

Result:

ctlcluster install works on Linux.

Target: trunk
Request: 2.15
Request: 2.14
Request: 2.13
Require-notes: no
Require-book: no
Acked-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Patch: https://rb.dcache.org/r/9063/
  • Loading branch information
gbehrmann committed Mar 2, 2016
1 parent 093579e commit 3e94b45
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/system-test/src/main/bin/ctlcluster
Expand Up @@ -87,11 +87,11 @@ case "$1" in
esac

# Add base config
CAT > "${DIR}/etc/dcache.conf" <<-EOF
cat > "${DIR}/etc/dcache.conf" <<-EOF
dcache.layout=system-test
EOF

CAT > "${DIR}/etc/layouts/system-test.conf" <<-EOF
cat > "${DIR}/etc/layouts/system-test.conf" <<-EOF
system-test.home=@TARGET@/dcache
dcache.pid.dir=/tmp
dcache.java.memory.heap=256m
Expand All @@ -109,7 +109,7 @@ case "$1" in
EOF

# Enable cell communication
sed -i '' -e "/dcache.broker.scheme=none/d" "@TARGET@/dcache/etc/layouts/system-test.conf"
sed -i'' -e "/dcache.broker.scheme=none/d" "@TARGET@/dcache/etc/layouts/system-test.conf"
;;

switch)
Expand Down

0 comments on commit 3e94b45

Please sign in to comment.