diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh index 171dcbded2bfa33d5f5ca38d876e57522eb552e5..e8254f49eb991e4302db659b89db761321431d9d 100644 --- a/tools/ExperimentSynchronizer/install_expSync.sh +++ b/tools/ExperimentSynchronizer/install_expSync.sh @@ -17,6 +17,17 @@ execute svn export $DM_SVN_URL/support/src/jdk-7u51-linux-x64.tar.gz JAVA_VERSION=7u51 tar zxf jdk-${JAVA_VERSION}*.tar.gz +cd ../resources +read -p "Enter Data Acquisition Service Host: " DAQ_SERVICE_HOST +read -p "Enter Experiment Data Root Directory: " DAQ_DATA_DIR + +echo "Generating config file" +cmd="cat config.properties.template \ + | sed 's?DAQ_CONNECTION?https://$DAQ_SERVICE_HOST:33336/dm?g' \ + | sed 's?DATA_DIR?$DAQ_DATA_DIR?g' \ + > config.properties" +eval $cmd || exit 1 + cd .. mkdir bin execute lib/jdk1.7.0_51/bin/javac -classpath lib/*:resources/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java diff --git a/tools/ExperimentSynchronizer/resources/config.properties b/tools/ExperimentSynchronizer/resources/config.properties deleted file mode 100644 index 00bbd9c677d37c49a142173c459849f5482495cd..0000000000000000000000000000000000000000 --- a/tools/ExperimentSynchronizer/resources/config.properties +++ /dev/null @@ -1,5 +0,0 @@ -dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm -dm.daqServ.connection = https://perch.aps.anl.gov:33336/dm -dm.daq.datadir = /data/ -#dm.truststore = /etc/pki/ca-trust/extracted/java/cacerts - diff --git a/tools/ExperimentSynchronizer/resources/config.property.template b/tools/ExperimentSynchronizer/resources/config.property.template new file mode 100644 index 0000000000000000000000000000000000000000..d68bc5edd1b16f569f8d809b0c9cb5779a3dcc2d --- /dev/null +++ b/tools/ExperimentSynchronizer/resources/config.property.template @@ -0,0 +1,5 @@ +dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm +dm.daqServ.connection = DAQ_CONNECTION +dm.daq.datadir = DATA_DIR + +