diff --git a/edexOsgi/build.edex/esb/bin/start.sh b/edexOsgi/build.edex/esb/bin/start.sh index fd753dcfec..245932a9af 100644 --- a/edexOsgi/build.edex/esb/bin/start.sh +++ b/edexOsgi/build.edex/esb/bin/start.sh @@ -54,9 +54,10 @@ export EDEX_HOME=$(dirname $dir) awips_home=$(dirname $EDEX_HOME) # Find the locations of awips2-python and awips2-java. -PYTHON_INSTALL="$awips_home/python" -JAVA_INSTALL="$awips_home/java" -PSQL_INSTALL="$awips_home/psql" +# only set if the location has not already been exported +if [ -z "$PYTHON_INSTALL" ]; then PYTHON_INSTALL="$awips_home/python"; fi +if [ -z "$JAVA_INSTALL" ]; then JAVA_INSTALL="$awips_home/java"; fi +if [ -z "$PSQL_INSTALL" ]; then PSQL_INSTALL="$awips_home/psql"; fi # Source The File With The Localization Information source ${dir}/setup.env diff --git a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel index d59826d7c2..628e5d0999 100644 --- a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel +++ b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel @@ -44,9 +44,10 @@ TODAY=`/bin/date +%Y%m%d` # We will no longer be using hard-coded paths that need to be replaced. # Use rpm to find the paths that we need. -JAVA_INSTALL="/awips2/java" -PYTHON_INSTALL="/awips2/python" +export JAVA_INSTALL="/awips2/java" +export PYTHON_INSTALL="/awips2/python" EDEX_INSTALL="/awips2/edex" +export PSQL_INSTALL="/awips2/psql" # The path that is to be used for the script export JAVA_HOME=${JAVA_INSTALL}