trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ama...@apache.org
Subject [2/4] incubator-trafodion git commit: Small changes
Date Mon, 14 Mar 2016 20:12:41 GMT
Small changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/75e8a3fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/75e8a3fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/75e8a3fb

Branch: refs/heads/master
Commit: 75e8a3fb075334b9ea90f06b1ad64ec68f5746e4
Parents: feeb350
Author: Amanda Moran <amanda@apache.com>
Authored: Fri Mar 11 23:20:11 2016 +0000
Committer: Amanda Moran <amanda@apache.com>
Committed: Fri Mar 11 23:20:11 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 8 ++++++--
 install/installer/traf_config_setup | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/75e8a3fb/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 251e7e6..a1ed2e9 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -426,10 +426,15 @@ else
          fi
        done
     fi
-    export PATH=$PATH:$JAVA_HOME/bin
+    hadoopPath="$HADOOP_PATH"
+    hadoopBinPath="$HADOOP_BIN_PATH"
+
+    export PATH="$PATH:$JAVA_HOME/bin"
     sudo chmod 777 $TRAF_CONFIG
     sed -i '/PATH\=/d' $TRAF_CONFIG
     echo "export PATH=\"$PATH\"" >>$TRAF_CONFIG
+    echo "export HADOOP_BIN_PATH=\"$hadoopBinPath\"" >>$TRAF_CONFIG
+    echo "export HADOOP_PATH=\"$hadoopPath\"" >>$TRAF_CONFIG
     sudo chmod 777 $TRAF_CONFIG
     source $TRAF_CONFIG
 fi
@@ -691,7 +696,6 @@ else
 fi
 
 echo "***INFO: nameOfVersion=$nameOfVersion"
-echo "here"
 sudo chmod 777 $TRAF_CONFIG
 source $TRAF_CONFIG
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/75e8a3fb/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 23f9834..63704d5 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -568,7 +568,7 @@ echo "export DCS_PRIMARY_MASTER_NODE=\"$DCS_PRIMARY_MASTER_NODE\"" >>
$LOCAL_TRA
 #==============================================
 #Enable HA
 
-echo -n "Enable High Avalability (Y/N), default is N: "
+echo -n "Enable High Availability (Y/N), default is N: "
 read answer
 
 if [[ ! -z $answer ]]; then


Mime
View raw message