Changeset 171

Timestamp:

Jun 9, 2010, 3:11:29 PM (15 years ago)

Author:

shunfa

Message:

修改nutch_node path(/home/nutchuser/nutchez/system/nutch_node)

Location:

nutchez-0.2/src/test

Files:

• client_install_func.sh (modified) (2 diffs)
• install (modified) (1 diff)
• install_func.sh (modified) (1 diff)
• nutchez (modified) (3 diffs)

nutchez-0.2/src/test/client_install_func.sh

@@ -245 +245 @@
   mkdir /home/nutchuser/nutchez
   mkdir /home/nutchuser/nutchez/source
+  mkdir /home/nutchuser/nutchez/system
   chmod 777 /opt/nutchez
   #su nutchuser -c "scp -r -o StrictHostKeyChecking=no nutchuser@$1:/opt/nutchez /opt/"
@@ -303 +304 @@
   fi
 
-  debug_info "ssh nutchuser@$1 echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/nutch_nodes"
-  su nutchuser -c "ssh nutchuser@$1 echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/nutch_nodes"
+  debug_info "ssh nutchuser@$1 echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
+  su nutchuser -c "ssh nutchuser@$1 echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
 
 #su nutchuser -c expect -c "spawn ssh nutchuser@$1

nutchez-0.2/src/test/install

@@ -36 +36 @@
     su nutchuser -c "mkdir /home/nutchuser/nutchez/search"
     su nutchuser -c "mkdir /home/nutchuser/nutchez/source"
+    su nutchuser -c "mkdir /home/nutchuser/nutchez/system"
     make_client_install
 

nutchez-0.2/src/test/install_func.sh

@@ -191 +191 @@
   debug_info "MasterIP_Address=$MasterIP_Address"
   debug_info "Master_Hostname=$(hostname)"
+  su nutchuser -c "echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
   set_hosts
   set_haoop-site

nutchez-0.2/src/test/nutchez

@@ -14 +14 @@
 #LIST_Option="off"
 
+# PATH Declaration
+NutchEZ_Install_PATH=/opt/nutchez
+NutchEZ_HOME=/home/nutchuser/nutchez
+
 # Functions Declaration #
 ## Prepare Check  ##
 function prepare_check(){ 
-if [ ! -e /home/nutchuser/nutch_nodes ]; then
+if [ ! -e $NutchEZ_HOME/system/nutch_nodes ]; then
     $DIALOG --clear --backtitle "= [NutchEz Management Interface] ~by NCHC =" --title "[nutch_nodes Files]" \
-    --msgbox "Fail: Don't find /home/nutchuser/nutch_nodes !!!" 10 40
+    --msgbox "Fail: Don't find $NutchEZ_Source_HOME/nutch_nodes !!!" 10 40
     exit
 fi
@@ -28 +32 @@
 
  if [ "$?" == "0" ]; then
-    ./duplicate_del /home/nutchuser/nutch_nodes
+    ./duplicate_del $NutchEZ_HOME/system/nutch_nodes
     echo -e "\nPlz input root password to update /etc/hosts !!!"
-    su root -c "./duplicate_del /etc/hosts && ./add_hosts /home/nutchuser/nutch_nodes /etc/hosts"
+    su root -c "./duplicate_del /etc/hosts && ./add_hosts $NutchEZ_HOME/nutch_nodes /etc/hosts"
  fi
-
 }
 
@@ -52 +55 @@
 function cluster_setup(){
 
-node_list=$(cat /home/nutchuser/nutch_nodes | awk '{print $1}')
+node_list=$(cat /home/nutchuser/nutchez/nutch_nodes | awk '{print $1}')
 #echo -e $node_list
 #read