You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ec...@apache.org on 2012/06/13 04:18:18 UTC
svn commit: r1349611 -
/hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
Author: ecapriolo
Date: Wed Jun 13 02:18:18 2012
New Revision: 1349611
URL: http://svn.apache.org/viewvc?rev=1349611&view=rev
Log:
HIVE-2911 Move Global .hiverc file (Owen O'Malley via egc)
Modified:
hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
Modified: hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
URL: http://svn.apache.org/viewvc/hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1349611&r1=1349610&r2=1349611&view=diff
==============================================================================
--- hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original)
+++ hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Wed Jun 13 02:18:18 2012
@@ -466,7 +466,21 @@ public class CliDriver {
}
if (ss.initFiles.size() == 0) {
if (System.getenv("HIVE_HOME") != null) {
- String hivercDefault = System.getenv("HIVE_HOME") + File.separator + "bin" + File.separator + HIVERCFILE;
+ String hivercDefault = System.getenv("HIVE_HOME") + File.separator +
+ "bin" + File.separator + HIVERCFILE;
+ if (new File(hivercDefault).exists()) {
+ int rc = processFile(hivercDefault);
+ if (rc != 0) {
+ System.exit(rc);
+ }
+ console.printError("Putting the global hiverc in " +
+ "$HIVE_HOME/bin/.hiverc is deprecated. Please "+
+ "use $HIVE_CONF_DIR/.hiverc instead.");
+ }
+ }
+ if (System.getenv("HIVE_CONF_DIR") != null) {
+ String hivercDefault = System.getenv("HIVE_CONF_DIR") + File.separator
+ + HIVERCFILE;
if (new File(hivercDefault).exists()) {
int rc = processFile(hivercDefault);
if (rc != 0) {
@@ -475,7 +489,8 @@ public class CliDriver {
}
}
if (System.getProperty("user.home") != null) {
- String hivercUser = System.getProperty("user.home") + File.separator + HIVERCFILE;
+ String hivercUser = System.getProperty("user.home") + File.separator +
+ HIVERCFILE;
if (new File(hivercUser).exists()) {
int rc = processFile(hivercUser);
if (rc != 0) {