svn commit: r1400329 - in /oozie/trunk: release-log.txt tools/src/main/bin/ooziedb.sh

[tu...@apache.org]

Author: tucu
Date: Fri Oct 19 23:04:57 2012
New Revision: 1400329

URL: http://svn.apache.org/viewvc?rev=1400329&view=rev
Log:
OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and OOZIE_DATA if previously set (rkanter via tucu)

Modified:
    oozie/trunk/release-log.txt
    oozie/trunk/tools/src/main/bin/ooziedb.sh

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1400329&r1=1400328&r2=1400329&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Oct 19 23:04:57 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.4.0 release (trunk - unreleased)
 
+OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and OOZIE_DATA if previously set (rkanter via tucu)
 OOZIE-1023 Docs list OOZIE_CONF instead of OOZIE_CONFIG env var (rkanter via tucu)
 OOZIE-1012 Sqoop jobs are unable to utilize Hadoop Counters (jarcec via virag)
 OOZIE-986 Oozie client shell script should use consistent naming for java options (stevenwillis via tucu)

Modified: oozie/trunk/tools/src/main/bin/ooziedb.sh
URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/main/bin/ooziedb.sh?rev=1400329&r1=1400328&r2=1400329&view=diff
==============================================================================
--- oozie/trunk/tools/src/main/bin/ooziedb.sh (original)
+++ oozie/trunk/tools/src/main/bin/ooziedb.sh Fri Oct 19 23:04:57 2012
@@ -33,29 +33,7 @@ done
 BASEDIR=`dirname ${PRG}`
 BASEDIR=`cd ${BASEDIR}/..;pwd`
 
-OOZIE_HOME=${BASEDIR}
-OOZIE_CONFIG=${OOZIE_HOME}/conf
-OOZIE_LOG=${OOZIE_HOME}/logs
-OOZIE_DATA=${OOZIE_HOME}/data
-
-if [ -f ${OOZIE_HOME}/bin/oozie-env.sh ]
-then
-  source ${OOZIE_HOME}/bin/oozie-env.sh
-fi
-
-if [ ! -d ${OOZIE_CONFIG} ]
-then
-  echo
-  echo "ERROR: Oozie configuration directory could not be found at ${OOZIE_CONFIG}"
-  echo
-  exit 1
-fi
-
-# if the configuration dir has a env file, source it
-if [ -f ${OOZIE_CONFIG}/oozie-env.sh ]
-then
-  source ${OOZIE_CONFIG}/oozie-env.sh
-fi
+source ${BASEDIR}/bin/oozie-sys.sh -silent
 
 OOZIEDB_OPTS="-Doozie.home.dir=${OOZIE_HOME}";
 OOZIEDB_OPTS="${OOZIEDB_OPTS} -Doozie.config.dir=${OOZIE_CONFIG}";