Merge "Issue #2509: Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1
Former-commit-id:2170fb5615
[formerly ec8c9e963137ec7b7201558c5ddd00d2affb3aa3] Former-commit-id:0476a288db
This commit is contained in:
commit
3cb44b9a12
1 changed files with 2 additions and 1 deletions
|
@ -24,6 +24,7 @@
|
||||||
# ------------ ---------- ----------- --------------------------
|
# ------------ ---------- ----------- --------------------------
|
||||||
# Dec 04, 2013 #2589 dgilling Create command-line arg that controls
|
# Dec 04, 2013 #2589 dgilling Create command-line arg that controls
|
||||||
# xvfb initialization.
|
# xvfb initialization.
|
||||||
|
# Feb 07, 2014 #2509 dgilling Fix baseline merge issue.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -38,7 +39,7 @@ CAVE_DIR=/awips2/cave
|
||||||
# execute the runProcedure module
|
# execute the runProcedure module
|
||||||
_GFECLI="${RUN_FROM_DIR}/gfeclient.sh"
|
_GFECLI="${RUN_FROM_DIR}/gfeclient.sh"
|
||||||
_GFECLI_ARGS="-enablegl"
|
_GFECLI_ARGS="-enablegl"
|
||||||
_MODULE="${CAVE_DIR}/etc/gfe/utility/PngWriter.py"
|
_MODULE="${RUN_FROM_DIR}/src/ifpimage/PngWriter.py"
|
||||||
|
|
||||||
# quoting of '$@' is used to prevent command line interpretation
|
# quoting of '$@' is used to prevent command line interpretation
|
||||||
if [ ! -f $_GFECLI ] || [ ! -d $CAVE_DIR ]
|
if [ ! -f $_GFECLI ] || [ ! -d $CAVE_DIR ]
|
||||||
|
|
Loading…
Add table
Reference in a new issue