Changeset 244

Timestamp:

Jul 1, 2010, 4:33:15 PM (14 years ago)

Author:

shunfa

Message:

修改驗證資料夾及語言檔

Location:

nutchez-0.2/src/shell

Files:

• client_install (modified) (1 diff)
• client_install_func.sh (modified) (2 diffs)
• client_remove (modified) (3 diffs)
• install (modified) (4 diffs)
• install_func.sh (modified) (5 diffs)
• lang/lang_en_US (modified) (1 diff)
• lang/lang_zh_TW (modified) (2 diffs)
• master_remove (modified) (2 diffs)

nutchez-0.2/src/shell/client_install

@@ -11 +11 @@
 # 需要 master_install 設定的參數區
 # Master IP here
-Master_IP_Address=140.110.138.192
+Master_IP_Address=your.master.ip.here
 # Master Hostname here
-Master_Hostname=u1004
+Master_Hostname=your.msater.hostname.here
 # 此檔自己用的參數區
 Linux_Distribution="";

nutchez-0.2/src/shell/client_install_func.sh

@@ -25 +25 @@
 
 # Default: source english
-. $Work_Path/lang/lang_en_US_client_install
+. $Work_Path/lang/lang_en_US
 # if locale is zh then source chinese
 
-echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW_client_install
+echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW
 }
 
@@ -291 +291 @@
     su nutchuser -c "scp -r -o StrictHostKeyChecking=no nutchuser@$1:/home/nutchuser/nutchez/source/NutchezForClientOf_$Master_IP_Address.tar.gz /home/nutchuser/nutchez/source"
   fi
+  cp -r lang /home/nutchuser/nutchez/system
+  cp client_remove lang_link /home/nutchuser/nutchez/system
 }
 

nutchez-0.2/src/shell/client_remove

@@ -10 +10 @@
 
 
-source lang_link
 # 需要 master_install 設定的參數區
 # Master IP here
@@ -31 +30 @@
 }
 ##########end echo function ##########
+
+function load_default_lang(){
+
+lang=$(locale | grep 'LANG=' | cut -d "=" -f2)
+
+# Default: source english
+. lang/lang_en_US
+# if locale is zh then source chinese
+
+echo $lang | grep 'zh' >> /dev/null && source lang/lang_zh_TW
+}
+
+
 
 # check root
@@ -80 +92 @@
 # Main function
 function main () {
+  load_default_lang
   check_root
   show_info "$CR_main_echo_1" #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"

nutchez-0.2/src/shell/install

@@ -25 +25 @@
 # Source functions
   source $Work_Path/install_func.sh;
-  source $Work_Path/lang_link;
+#  source $Work_Path/lang_link;
 ### real code #####
 
@@ -38 +38 @@
 
 main () {
+  load_default_lang
   check_info
   show_info "$MI_main_echo_1"
@@ -52 +53 @@
     unzip_nV2_pack
 
+    
     su nutchuser -c "mkdir /home/nutchuser/nutchez"
     su nutchuser -c "mkdir /home/nutchuser/nutchez/urls"
@@ -61 +63 @@
     Install_Nutch
 
-    mkdir /var/nutchez
+   if [ ! -d "/var/nutchez" ]; then
+     mkdir /var/nutchez
+   fi
+
     # 建立 nutch 與 tomcat 的 logs 資料夾
     mkdir /var/nutchez/tomcat-logs

nutchez-0.2/src/shell/install_func.sh

@@ -31 +31 @@
 ##########end echo function ##########
 
-function choose_lang(){
+function load_default_lang(){
 
 lang=$(locale | grep 'LANG=' | cut -d "=" -f2)
 
 # Default: source english
-. $Work_Path/install_lang.en
+. $Work_Path/lang/lang_en_US
 # if locale is zh then source chinese
-echo $lang | grep 'zh' >> /dev/null && source $Work_Path/install_lang.zh
-
-# Ask language
-echo -e "\n$choose_lang_1"
-read -p "$choose_lang_2 " langChoice
-
-if [ $langChoice == "2" ]; then
-    source $Work_Path/install_lang.zh
-else
-    source $Work_Path/install_lang.en
-fi
+
+echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW
 }
 
@@ -407 +398 @@
   debug_info "$MI_install_Nutch_echo_2 $(hostname)"
 # debug_info "Master_Hostname=$(hostname)"
-  su nutchuser -c "ssh localhost echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
+  su nutchuser -c "ssh -o StrictHostKeyChecking=no localhost echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
   set_hosts
   set_haoop-site
@@ -458 +449 @@
 function make_client_install () {
   # 建立資料夾(用來存放client的安奘檔)
-  su nutchuser -c "mkdir $User_HOME/source"
+
+   if [ ! -d "$User_HOME/source" ]; then
+     su nutchuser -c "mkdir $User_HOME/source"
+   fi
+
 
   # 將Master_IP_Address給client
@@ -482 +477 @@
   # 複製 nutchez/source 到使用者的安裝資料夾
    
-   mkdir $Install_Dir/Client_DIR
-   cp -rf /home/nutchuser/nutchez/source/* $Install_Dir/Client_DIR/
+
+
+   if [ ! -d "$Install_Dir/Client_Install_DIR" ]; then
+     mkdir $Install_Dir/Client_Install_DIR
+   fi
+   cp -rf /home/nutchuser/nutchez/source/* $Install_Dir/Client_Install_DIR/
    
 #  cp $Work_Path/client_install $Work_Path/client_install /home/nutchuser/nutchez/source
@@ -514 +513 @@
   show_info "$MI_client_install_commands_echo_4"
   show_info "$MI_client_install_commands_echo_5"
-  show_info "$MI_client_install_commands_echo_6"
-  show_info "$MI_client_install_commands_echo_7"
-
-#  show_info "Client Install Command as Follows:"
-#  show_info "cd ~"
-#  show_info "mkdir nutchez_client_install"
-#  show_info "cd nutchez_client_install"
-#  show_info "scp nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/* ."
-#  show_info "sudo su"
-#  show_info "./client_install"
-}
+}

nutchez-0.2/src/shell/lang/lang_en_US

@@ -133 +133 @@
 #
 MI_client_install_commands_echo_1="For client install, please refer commands as follows："
-MI_client_install_commands_echo_2="cd ~"
-MI_client_install_commands_echo_3="mkdir nutchez_client_install"
-MI_client_install_commands_echo_4="cd nutchez_client_install"
-MI_client_install_commands_echo_5="scp -r nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/* ."
-MI_client_install_commands_echo_6="sudo su"
-MI_client_install_commands_echo_7="./client_install"
+MI_client_install_commands_echo_2="scp nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/client_deploy ."
+MI_client_install_commands_echo_3="./client_deploy"
+MI_client_install_commands_echo_4="sudo su"
+MI_client_install_commands_echo_5="~/nutchez_client_install/client_install"
 
 ########## Lang for Master Install - End##########

nutchez-0.2/src/shell/lang/lang_zh_TW

@@ -10 +10 @@
 
 ############ Lang for master_install -Start ############
-MI_main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定>密碼"
+MI_main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定密碼"
 MI_main_echo_2="請確認上述的安裝資訊：1.正確 2.不正確 "
 MI_main_echo_3="安裝成功！"
@@ -134 +134 @@
 MI_client_install_commands_echo_1="Client安裝可參考以下指令："
 MI_client_install_commands_echo_2="scp nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/client_deploy ."
-MI_client_install_commands_echo_3=""
-MI_client_install_commands_echo_4=""
-MI_client_install_commands_echo_5=""
-MI_client_install_commands_echo_6="sudo su"
-MI_client_install_commands_echo_7="~/nutchez_client_install/client_install"
+MI_client_install_commands_echo_3="./client_deploy"
+MI_client_install_commands_echo_4="sudo su"
+MI_client_install_commands_echo_5="cd nutchez_client_install; ./client_install"
 
 ########## Lang for Master Install - End##########

nutchez-0.2/src/shell/master_remove

@@ -9 +9 @@
 #   
 
-source /home/nutchuser/nutchez/system/lang_link
+#source /home/nutchuser/nutchez/system/lang_link
 
 ##########  echo function  ##########
@@ -28 +28 @@
 nutch_PATH=/home/nutchuser/nutchez/system
 
+function load_default_lang(){
+
+lang=$(locale | grep 'LANG=' | cut -d "=" -f2)
+
+# Default: source english
+. $Work_Path/lang/lang_en_US
+# if locale is zh then source chinese
+
+echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW
+}
 
 # check root