From 7002dcbca30176812f9210e62e2bc0194cb5ce82 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Wed, 17 Jul 2019 19:41:53 +0200
Subject: [PATCH] Example.DDS: Fix support for ssh rms plugin

---
 examples/dds/CMakeLists.txt            |  8 ++++++++
 examples/dds/ex-dds-hosts.cfg          |  6 +++---
 examples/dds/ex-dds-topology.xml       |  3 +++
 examples/dds/fairmq-ex-dds-env.sh      | 11 +++++++++++
 examples/dds/fairmq-start-ex-dds.sh.in |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100755 examples/dds/fairmq-ex-dds-env.sh

diff --git a/examples/dds/CMakeLists.txt b/examples/dds/CMakeLists.txt
index 8d6e96f7..6e14509a 100644
--- a/examples/dds/CMakeLists.txt
+++ b/examples/dds/CMakeLists.txt
@@ -32,6 +32,7 @@ set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
 set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-hosts.cfg ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh @ONLY)
 
 # test
@@ -52,6 +53,7 @@ install(
 set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
 set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install @ONLY)
 
 install(
@@ -65,6 +67,12 @@ install(
     DESTINATION ${PROJECT_INSTALL_DATADIR}
 )
 
+install(
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install
+    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    RENAME fairmq-ex-dds-env.sh
+)
+
 install(
     PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install
     DESTINATION ${PROJECT_INSTALL_BINDIR}
diff --git a/examples/dds/ex-dds-hosts.cfg b/examples/dds/ex-dds-hosts.cfg
index 26070783..981347c9 100644
--- a/examples/dds/ex-dds-hosts.cfg
+++ b/examples/dds/ex-dds-hosts.cfg
@@ -2,6 +2,6 @@
 # source setup.sh
 @bash_end@
 
-sampler, username@localhost, , /home/username/dev/dds-work/, 1
-processor, username@localhost, , /home/username/dev/dds-work/, 10
-sink, username@localhost, , /home/username/dev/dds-work/, 1
+sampler,   localhost, , /tmp/fairmq-ex-dds, 1
+processor, localhost, , /tmp/fairmq-ex-dds, 10
+sink,      localhost, , /tmp/fairmq-ex-dds, 1
diff --git a/examples/dds/ex-dds-topology.xml b/examples/dds/ex-dds-topology.xml
index 20d548c1..18870a47 100644
--- a/examples/dds/ex-dds-topology.xml
+++ b/examples/dds/ex-dds-topology.xml
@@ -8,6 +8,7 @@
     <declrequirement name="SinkWorker" type="wnname" value="sink"/>
 
     <decltask name="Sampler">
+        <env reachable="false">fairmq-ex-dds-env.sh</env>
         <exe>fairmq-ex-dds-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -P dds --iterations 10</exe>
         <requirements>
             <name>SamplerWorker</name>
@@ -18,6 +19,7 @@
     </decltask>
 
     <decltask name="Processor">
+        <env reachable="false">fairmq-ex-dds-env.sh</env>
         <exe>fairmq-ex-dds-processor --id processor_%taskIndex% --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds</exe>
         <requirements>
             <id>ProcessorWorker</id>
@@ -29,6 +31,7 @@
     </decltask>
 
     <decltask name="Sink">
+        <env reachable="false">fairmq-ex-dds-env.sh</env>
         <exe>fairmq-ex-dds-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -P dds --iterations 10</exe>
         <requirements>
             <name>SinkWorker</name>
diff --git a/examples/dds/fairmq-ex-dds-env.sh b/examples/dds/fairmq-ex-dds-env.sh
new file mode 100755
index 00000000..719f837d
--- /dev/null
+++ b/examples/dds/fairmq-ex-dds-env.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+################################################################################
+#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+export PATH=@BIN_DIR@:$PATH
diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in
index df92c453..3df054aa 100755
--- a/examples/dds/fairmq-start-ex-dds.sh.in
+++ b/examples/dds/fairmq-start-ex-dds.sh.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 ################################################################################
 #    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #