Changeset 203

Timestamp:

Jun 17, 2010, 4:51:05 PM (15 years ago)

Author:

shunfa

Message:

修改語言檔

Location:

nutchez-0.2/src/test

Files:

• client_remove.sh (modified) (4 diffs)
• install_func.sh (modified) (16 diffs)
• lang_zh_TW_client_install (modified) (1 diff)
• lang_zh_TW_client_remove (modified) (1 diff)
• master_remove.sh (modified) (5 diffs)

nutchez-0.2/src/test/client_remove.sh

@@ -46 +46 @@
 # shutdown service
 function shutdown_service () {
-  show_info $shutdown_service_echo_1 # "關閉本機服務..."
+  show_info "$shutdown_service_echo_1" # "關閉本機服務..."
   su nutchuser -c "/opt/nutchez/nutch/bin/hadoop-daemon.sh stop datanode"
   su nutchuser -c "/opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
-  show_info $shutdown_service_echo_2 # "本機服務已關閉"
+  show_info "$shutdown_service_echo_2" # "本機服務已關閉"
 }
 
 # 移除檔案及資料夾
 function remove_folders () {
-  show_info $remove_folders_echo_1 # "正在刪除安裝時所建立的檔案及資料夾..."
+  show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
   rm -rf /opt/nutchez/*
   rm -rf /var/nutchez/*
-  show_info $remove_folders_echo_2 # "安裝時所建立的檔案及資料夾已刪除"
+  show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
 }
 
@@ -63 +63 @@
 # 還原/etc/hosts
 function edit_hosts () {
-  show_info $edit_hosts_echo_1 # "修改/etc/hosts..."
+  show_info "$edit_hosts_echo_1" # "修改/etc/hosts..."
   Line_NO=`cat /etc/hosts | grep -n $Master_IP_Address | sed 's/:.*//g'`
   sed -i ''$Line_NO'd' /etc/hosts
-  show_info $edit_hosts_echo_2 # "完成修改/etc/hosts"
+  show_info "$edit_hosts_echo_2" # "完成修改/etc/hosts"
 }
 
@@ -72 +72 @@
 # 移除使用者
 function user_delete () {
-  show_info $user_delete_echo_1 # "正在刪除nutchuser使用者..."
+  show_info "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
   userdel -r nutcheruser
-  show_info $user_delete_echo_2 # "使用者nutchuser已刪除"
+  show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
 }
 
 # Main function
 function main () {
-  show_info $main_echo_1 #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-  show_info $main_echo_2 #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
+  show_info "$main_echo_1" #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+  show_info "$main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
 # 詢問是否繼續
   read -p "$main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
@@ -90 +90 @@
     edit_hosts
     user_delete
-    show_info $main_echo_4 # "移除程序已完成！"
+    show_info "$main_echo_4" # "移除程序已完成！"
   elif [ $confirm -eq 2 ]; then
-    show_info $main_echo_5 # "您已取消移除程序！"
-    show_info $main_echo_6 # "若要移除請再重新執行！"
+    show_info "$main_echo_5" # "您已取消移除程序！"
+    show_info "$main_echo_6" # "若要移除請再重新執行！"
   fi
 }

nutchez-0.2/src/test/install_func.sh

@@ -234 +234 @@
   else
     declare -i i=1
-    show_info $select_eth_echo_1
+    show_info "$select_eth_echo_1"
 #   show_info  "\nSystem have multiple network device, which network use for this machine: "
 
@@ -242 +242 @@
         i=i+1
       done
-      read -p "$select_eth_echo_2 " net_choice
+      read -p "$select_eth_echo_2" net_choice
 #     read -p "Please choice(1/2/3...): " net_choice
     if [ -z $net_choice ]; then
@@ -248 +248 @@
     fi
 
-    show_info $select_eth_echo_3
+    show_info "$select_eth_echo_3"
 #   show_info "Your choice is $net_choice"
     net_interface=$(echo $net_interfaces | cut -d " " -f $net_choice)
@@ -255 +255 @@
     net_MacAddr=$(ifconfig $net_interface | grep 'HW' | sed 's/^.*HWaddr //g')
 
-    show_info $select_eth_echo_4
+    show_info "$select_eth_echo_4"
 #   show_info "net_address is $net_address"
-    show_info $select_eth_echo_5
+    show_info "$select_eth_echo_5"
 #   show_info "net_MacAddr is $net_MacAddr"
   fi
@@ -269 +269 @@
 
 function make_ssh_key () {
-  debug_info $make_ssh_key_echo_1
+  debug_info "$make_ssh_key_echo_1"
 # debug_info "Make ssh key(begin...)"
   su nutchuser -c 'ssh-keygen -t rsa -f ~/.ssh/id_rsa -P ""'
   su nutchuser -c "cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys"
   su nutchuser -c "ssh-add /home/nutchuser/.ssh/id_rsa"
-  debug_info $make_ssh_key_echo_2
+  debug_info "$make_ssh_key_echo_2"
 # debug_info "Make ssh key(done!)"
 }
@@ -280 +280 @@
 
 function set_haoop-site () {
-  debug_info $set_haoop_site_echo_1
+  debug_info "$set_haoop_site_echo_1"
 # debug_info "set hadoop-site.xml(begin...)"
   cd $Nutch_HOME/conf/
@@ -299 +299 @@
 </configuration>
 EOF
-  debug_info $set_haoop_site_echo_2
+  debug_info "$set_haoop_site_echo_2"
 # debug_info "set hadoop-site.xml(done!)"
 }
@@ -305 +305 @@
 # 修改nutch-site.xml中-http.agent.url, http.agent.email
 function set_nutch-site () {
-  debug_info $set_haoop_site_echo_1
+  debug_info "$set_haoop_site_echo_1"
 # debug_info "set nutch-site.xml(begin...)"
   Line_NO=`cat $Nutch_HOME'/conf/nutch-site.xml' | grep -n 'http.agent.url' | sed 's/:.*//g'`
-  debug_info $set_haoop_site_echo_2
+  debug_info "$set_haoop_site_echo_2"
 # debug_info "debug...http.agent.url line number = $Line_NO..."
   sed -i ''$((Line_NO+1))'d' $Nutch_HOME/conf/nutch-site.xml
-  debug_info $set_haoop_site_echo_3
+  debug_info "$set_haoop_site_echo_3"
 # debug_info "debug...edit http.agent.url delete line $((Line_NO+1))..."
   sed -i ''$Line_NO'a <value>'$MasterIP_Address'</value>' $Nutch_HOME/conf/nutch-site.xml
-  debug_info $set_haoop_site_echo_4
+  debug_info "$set_haoop_site_echo_4"
 # debug_info "debug...edit http.agent.url done..."
 
   Line_NO=`cat $Nutch_HOME'/conf/nutch-site.xml' | grep -n 'http.agent.email' | sed 's/:.*//g'`
-  debug_info $set_haoop_site_echo_5
+  debug_info "$set_haoop_site_echo_5"
 # debug_info "debug...http.agent.email line number = $Line_NO..."
 
   sed -i ''$((Line_NO+1))'d' $Nutch_HOME/conf/nutch-site.xml
-  debug_info $set_haoop_site_echo_6
+  debug_info "$set_haoop_site_echo_6"
 # debug_info "debug...edit http.agent.email delete line $((Line_NO+1))..."
   sed -i ''$Line_NO'a <value>'$Admin_email'</value>' $Nutch_HOME/conf/nutch-site.xml
-  debug_info $set_haoop_site_echo_7
+  debug_info "$set_haoop_site_echo_7"
 # debug_info "debug...edit http.agent.email done..."
-  debug_info $set_haoop_site_echo_8
+  debug_info "$set_haoop_site_echo_8"
 # debug_info "set nutch-site.xml(done!)"
 }
 
 function format_HDFS () {
-  debug_info $format_HDFS_echo_1 
+  debug_info "$format_HDFS_echo_1"
   su nutchuser -c "$Nutch_HOME/bin/hadoop namenode -format"
-  debug_info $format_HDFS_echo_2
+  debug_info "$format_HDFS_echo_2"
 }
 
 function start_up_NutchEZ (){
-  debug_info $start_up_NutchEZ_echo_1
+  debug_info "$start_up_NutchEZ_echo_1"
 # debug_info "start up NutchEZ..."
   su nutchuser -c "$Nutch_HOME/bin/start-all.sh"
@@ -345 +345 @@
 
 function set_hosts () {
-  debug_info $set_hosts_echo_1
+  debug_info "$set_hosts_echo_1"
   Line_NO=`cat /etc/hosts | grep -n $(hostname) | sed 's/:.*//g'`
   content=$(cat /etc/hosts | awk 'NR=='$Line_NO'{printf "# " ; print}' )
@@ -353 +353 @@
 
 function Install_Nutch () {
-  debug_info $install_Nutch_echo_1
+  debug_info "$install_Nutch_echo_1"
 # debug_info "MasterIP_Address=$MasterIP_Address"
-  debug_info $install_Nutch_echo_2
+  debug_info "$install_Nutch_echo_2"
 # debug_info "Master_Hostname=$(hostname)"
   su nutchuser -c "echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
@@ -367 +367 @@
   cd $Start_PATH
   Line_NO=`cat client_install | grep -n '# Master IP here' | sed 's/:.*//g'`
-  debug_info $client_PassMasterIPAddr_echo_1
+  debug_info "$client_PassMasterIPAddr_echo_1"
 # debug_info "debug...Master IP here line number = $Line_NO..."
   sed -i ''$((Line_NO+1))'d' client_install
-  debug_info $client_PassMasterIPAddr_echo_2
+  debug_info "$client_PassMasterIPAddr_echo_2"
 # debug_info "debug...edit Master IP at line $((Line_NO+1))..."
   sed -i ''$Line_NO'a Master_IP_Address='$MasterIP_Address'' client_install
-  debug_info $client_PassMasterIPAddr_echo_3
+  debug_info "$client_PassMasterIPAddr_echo_3"
 # debug_info "edit client_install done..."
 }
@@ -381 +381 @@
   cd $Start_PATH
   Line_NO=`cat client_install | grep -n '# Master Hostname here' | sed 's/:.*//g'`
-  debug_info $client_PassMaster_Hostname_echo_1
+  debug_info "$client_PassMaster_Hostname_echo_1"
 # debug_info "debug...Master hostname here line number = $Line_NO..."
   sed -i ''$((Line_NO+1))'d' client_install
-  debug_info $client_PassMaster_Hostname_echo_2
+  debug_info "$client_PassMaster_Hostname_echo_2"
 # debug_info "debug...edit Master Hostname at line $((Line_NO+1))..."
   sed -i ''$Line_NO'a Master_Hostname='$(hostname)'' client_install
-  debug_info $client_PassMaster_Hostname_echo_3
+  debug_info "$client_PassMaster_Hostname_echo_3"
 # debug_info "edit client_install done..."
 }
@@ -399 +399 @@
   # 打包安裝目錄(不含tomcat)
  
-  debug_info $make_client_install_echo_1
+  debug_info "$make_client_install_echo_1"
 # debug_info "function make_client_install..."
 
@@ -413 +413 @@
 
 function start_up_tomcat () {
-  debug_info $start_up_tomcat_echo_1
+  debug_info "$start_up_tomcat_echo_1"
 # debug_info "start up tomcat..."
 
@@ -420 +420 @@
     do
       sleep 1s
-      debug_info $start_up_tomcat_echo_2
+      debug_info "$start_up_tomcat_echo_2"
 #     debug_info "wait $i sec..."
       i=`expr $i - 1`
     done
   su nutchuser -c "$Tomcat_HOME/bin/startup.sh"
-  debug_info $start_up_tomcat_echo_3
+  debug_info "$start_up_tomcat_echo_3"
 # debug_info "tomcat has been started..."
 }
@@ -432 +432 @@
 # client簡易步驟
 function client_install_commands () {
-  show_info $client_install_commands_echo_1
-  show_info $client_install_commands_echo_2
-  show_info $client_install_commands_echo_3
-  show_info $client_install_commands_echo_4
-  show_info $client_install_commands_echo_5
-  show_info $client_install_commands_echo_6
-  show_info $client_install_commands_echo_7
+  show_info "$client_install_commands_echo_1"
+  show_info "$client_install_commands_echo_2"
+  show_info "$client_install_commands_echo_3"
+  show_info "$client_install_commands_echo_4"
+  show_info "$client_install_commands_echo_5"
+  show_info "$client_install_commands_echo_6"
+  show_info "$client_install_commands_echo_7"
 
 

nutchez-0.2/src/test/lang_zh_TW_client_install

@@ -13 +13 @@
 par_echo_1="Master 的 IP位址: "
 par_echo_2="資料是否正確 (yes/no): "
-par_echo_3="資料是正錯的"
+par_echo_3="資料是正確的"
 par_echo_4="請修改為正確的參數"
 

nutchez-0.2/src/test/lang_zh_TW_client_remove

@@ -30 +30 @@
 
 # main
-main_echo_1="警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+main_echo_1="警告-此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
 main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
 main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"

nutchez-0.2/src/test/master_remove.sh

@@ -41 +41 @@
 # shutdown service
 function shutdown_service () {
-  show_info $shutdown_service_echo_1 # "停止其他尚未關閉的slaves服務..."
+  show_info "$shutdown_service_echo_1" # "停止其他尚未關閉的slaves服務..."
   slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
   for nutch_node in $slaves_list
@@ -48 +48 @@
     su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
   done
-  show_info $shutdown_service_echo_2 # "關閉本機服務..."
+  show_info "$shutdown_service_echo_2" # "關閉本機服務..."
   su nutchuser -c "/opt/nutchez/nutch/bin/stop-all.sh"
-  show_info $shutdown_service_echo_3 # "本機服務已關閉"
+  show_info "$shutdown_service_echo_3" # "本機服務已關閉"
 }
 
 # 移除檔案及資料夾
 function remove_folders () {
-  show_info $remove_folders_echo_1 # "正在刪除安裝時所建立的檔案及資料夾..."
+  show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
   rm -rf /opt/nutchez/*
   rm -rf /var/nutchez/*
-  show_info $remove_folders_echo_2 # "安裝時所建立的檔案及資料夾已刪除"
+  show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
 }
 
@@ -64 +64 @@
 # 還原/etc/hosts
 function edit_hosts () {
-  show_info $edit_hosts_echo_1 # "修改/etc/hosts..."
+  show_info "$edit_hosts_echo_1" # "修改/etc/hosts..."
   
   slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
@@ -72 +72 @@
     sed -i ''$Line_NO'd' /etc/hosts
   done
-  show_info $edit_hosts_echo_2 # "完成修改/etc/hosts"
+  show_info "$edit_hosts_echo_2" # "完成修改/etc/hosts"
 }
 
 # 移除使用者
 function user_delete () {
-  show_info $user_delete_echo_1 # "正在刪除nutchuser使用者..."
+  show_info "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
   userdel -r nutcheruser
-  show_info $user_delete_echo_2 # "使用者nutchuser已刪除"
+  show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
 }
 
 # Main function
 function main () {
-  show_info $main_echo_1 #"警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-  show_info $main_echo_2 #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
+  show_info "$main_echo_1" #"警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+  show_info "$main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
 # 詢問是否繼續
   read -p "$main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
@@ -95 +95 @@
     edit_hosts
     user_delete
-    show_info $main_echo_4 # "移除程序已完成！"
+    show_info "$main_echo_4" # "移除程序已完成！"
   elif [ $confirm -eq 2 ]; then
-    show_info $main_echo_5 # "您已取消移除程序！"
-    show_info $main_echo_6 # "若要移除請再重新執行！"
+    show_info "$main_echo_5" # "您已取消移除程序！"
+    show_info "$main_echo_6" # "若要移除請再重新執行！"
   fi
 }