xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2240 Fix incorrect environment assumptions" into development

Browse source 
Former-commit-id: 351390cee7 [formerly 6b91e4573c] [formerly 60cd44b5a5] [formerly 60cd44b5a5 [formerly 3c8f6762fe]] [formerly d997b1b0fe [formerly 60cd44b5a5 [formerly 3c8f6762fe] [formerly d997b1b0fe [formerly 8894c03f3db89e44ddc97d1ca897130670291687]]]]
Former-commit-id: d997b1b0fe
Former-commit-id: 6751a9f6a7544389c3f80df88c66300fa348b301 [formerly e5a7649b5337ac75fddb9721acff4c9bd6ed00c3] [formerly 9e393f0e9b [formerly d3f04844c1]]
Former-commit-id: 9e393f0e9b
Former-commit-id: e07982bf6d
This commit is contained in:
Richard Peter 2013-08-16 15:15:54 -05:00 • committed by Gerrit Code Review
commit 7537d0206e
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edexOsgi/build.edex/esb/bin/start.sh
View file

@ -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

5
rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
View file

@ -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}