From 6883cdc38939b250807373f83e53cd67754b1b24 Mon Sep 17 00:00:00 2001 From: Everett Kladstrup Date: Fri, 16 Aug 2013 10:50:23 -0500 Subject: [PATCH] Issue #2240 Fix incorrect environment assumptions * using $awips_home as the prefix for java/python/psql causes problems on edex-environment (wes2bridge) installs; where $awips_home does not contain the java/python/psql installs, instead they are located at /awips2 Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee Former-commit-id: 535248b69b73160546f0a0c8d88002b3987a3d59 [formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f] Former-commit-id: fba53e9fe3802bf0198735330f13d889fa381531 --- edexOsgi/build.edex/esb/bin/start.sh | 7 ++++--- rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) 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}