Skip to content
Snippets Groups Projects
Commit a9f1e66d authored by Arno Schoenmakers's avatar Arno Schoenmakers
Browse files

Bug 1228: Fix typo and allow useage with -M option on development system

parent 4c972367
Branches
Tags
No related merge requests found
...@@ -47,7 +47,7 @@ SyntaxError() ...@@ -47,7 +47,7 @@ SyntaxError()
echo " Output dir is then /opt/pvss/dpdef (overrules -d)" echo " Output dir is then /opt/pvss/dpdef (overrules -d)"
echo " -C CEP datapoints are created (overrules -s)" echo " -C CEP datapoints are created (overrules -s)"
echo " -M MainCU datapoints are created (overrules -s)" echo " -M MainCU datapoints are created (overrules -s)"
echo "" echo " Default option is -M"
exit 1 exit 1
} }
...@@ -1207,14 +1207,14 @@ if [ "$DBTYPE" == "S" -a "$DBTYPENAME" == "LOCALHOST" ]; then ...@@ -1207,14 +1207,14 @@ if [ "$DBTYPE" == "S" -a "$DBTYPENAME" == "LOCALHOST" ]; then
STNNAME=$DBTYPENAME STNNAME=$DBTYPENAME
cd $DESTDIR cd $DESTDIR
echo "Making files for station $STNNAME in $DESTDIR" echo "Making files for station $STNNAME in $DESTDIR"
elif [ "$DBTYPE" == "M" ]; then elif [ "$DBTYPE" == "M" -a "$HOSTNAME" == "MCU001" ]; then
configdir="/opt/lofar/etc/" configdir="/opt/lofar/etc/"
dpdefdir="/opt/pvss/dpdef/" dpdefdir="/opt/pvss/dpdef/"
DESTDIR=$dpdefdir DESTDIR=$dpdefdir
STNNAME=$DBTYPENAME STNNAME=$DBTYPENAME
cd $DESTDIR cd $DESTDIR
echo "Making files for $STNNAME in $DESTDIR" echo "Making files for $STNNAME in $DESTDIR"
elif [ "$DBTYPE" == "C" ]; then elif [ "$DBTYPE" == "C" -a "$HOSTNAME" == "CCU001" ]; then
configdir="/opt/lofar/etc/" configdir="/opt/lofar/etc/"
dpdefdir="/opt/pvss/dpdef/" dpdefdir="/opt/pvss/dpdef/"
DESTDIR=$dpdefdir DESTDIR=$dpdefdir
...@@ -1268,8 +1268,9 @@ create_dp_file ${INPUTFILE} ${DBTYPE} ...@@ -1268,8 +1268,9 @@ create_dp_file ${INPUTFILE} ${DBTYPE}
cat ${TMP_FILE} >>${DESTDIR}/${DPT_FILE} cat ${TMP_FILE} >>${DESTDIR}/${DPT_FILE}
rm -f ${TMP_FILE} rm -f ${TMP_FILE}
# Creating the c++ header file is for development, only # Creating the c++ header file is for development hosts, only; in that case
if [ "${DBTYPE}" != "S" -a "${DBTYPE}" != "M" -a "${DBTYPE}" != "C"]; then # the $dpdefdir is an empty string
if [ "${dpdefdir}" == "" ]; then
( (
echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date
echo "" echo ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment