Index: /nutchez-0.2/src/test/client_remove.sh
===================================================================
--- /nutchez-0.2/src/test/client_remove.sh	(revision 205)
+++ /nutchez-0.2/src/test/client_remove.sh	(revision 206)
@@ -53,6 +53,6 @@
 function remove_folders () {
   show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
-  rm -rf /opt/nutchez/*
-  rm -rf /var/nutchez/*
+  rm -rf /opt/nutchez
+  rm -rf /var/nutchez
   show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
 }
@@ -73,5 +73,5 @@
 function user_delete () {
   show_info "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
-  userdel -r nutcheruser
+  userdel -r nutchuser
   show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
 }
Index: /nutchez-0.2/src/test/install
===================================================================
--- /nutchez-0.2/src/test/install	(revision 205)
+++ /nutchez-0.2/src/test/install	(revision 206)
@@ -28,7 +28,8 @@
 main () {
   check_info
-  show_info $main_echo_1
+  show_info "$main_echo_1"
 # show_info "歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定密碼"
   set_install_information
+  show_master_info
   read -p "$main_echo_2" confirm
 # read -p "Please confirm your install infomation: 1.Yes 2.No  " confirm
@@ -36,8 +37,9 @@
     creat_nutchuser_account $Nutchuser_Passwd
     make_ssh_key
-    
     # 解壓縮
     tar -zxvf nutchezV2-current.tar.gz -C /opt/
+    
     Install_Nutch
+
     mkdir /var/nutchez
     chown -R nutchuser:nutchuser /opt/nutchez
@@ -49,6 +51,6 @@
     su nutchuser -c "mkdir /home/nutchuser/nutchez/source"
     su nutchuser -c "mkdir /home/nutchuser/nutchez/system"
+
     make_client_install
-
     # 啟動系統
     format_HDFS
@@ -56,7 +58,7 @@
     start_up_tomcat    
     # 安裝流程結束，並進入網頁管理頁面設定爬網網址...等  
-    show_info $main_echo_3
+    show_info "$main_echo_3"
 #   show_info "Install Successfully!!"
-    show_info $main_echo_4
+    show_info "$main_echo_4"
 #   show_info "Visit http://$MasterIP_Address:8080"
     client_install_commands
Index: /nutchez-0.2/src/test/install_func.sh
===================================================================
--- /nutchez-0.2/src/test/install_func.sh	(revision 205)
+++ /nutchez-0.2/src/test/install_func.sh	(revision 206)
@@ -96,5 +96,5 @@
 function check_nez_installed(){
   debug_info "$check_nez_1"
-  if [ -d "opt/nutchez" ]; then
+  if [ -d "/opt/nutchez" ]; then
     show_info "$check_nez_2"
     exit
@@ -221,4 +221,43 @@
 }
 
+# 新增nutchuser 帳號時用 Nutchuser_Passwd 當密碼
+function creat_nutchuser_account(){
+  debug_info "$create_nutchuser_d1"
+  while [ "$Nutchuser_Passwd" != "$Nutchuser_Passwd2" ]
+  do
+      echo -e "\n"
+      read -sp "$create_nutchuser_1" Nutchuser_Passwd
+      echo 
+      read -sp "$create_nutchuser_2" Nutchuser_Passwd2
+      echo 
+        if [ "$Nutchuser_Passwd" == "$Nutchuser_Passwd2" ]; then
+          show_info "$create_nutchuser_3"
+        else
+          show_info "$create_nutchuser_4"
+        fi
+  done                                                                                                                         
+  unset Nutchuser_Passwd2
+
+  if [ $(cat /etc/passwd | grep nutchuser) ]; then
+    show_info "$create_nutchuser_s1"
+    expect -c "spawn passwd nutchuser
+    set timeout 1
+    expect \"*: \"
+    send \"$Nutchuser_Passwd\r\"
+    expect \"*: \"
+    send \"$Nutchuser_Passwd\r\"
+    expect eof"
+    else
+      show_info "$create_nutchuser_s2"
+      useradd -m nutchuser -s /bin/bash
+      expect -c "spawn passwd nutchuser
+      set timeout 1
+      expect \"*: \"
+      send \"$Nutchuser_Passwd\r\"
+      expect \"*: \"
+      send \"$Nutchuser_Passwd\r\"
+      expect eof"
+  fi
+}
 
 function select_eth () {
@@ -248,5 +287,5 @@
     fi
 
-    show_info "$select_eth_echo_3"
+    show_info "$select_eth_echo_3 $net_choice"
 #   show_info "Your choice is $net_choice"
     net_interface=$(echo $net_interfaces | cut -d " " -f $net_choice)
@@ -255,7 +294,7 @@
     net_MacAddr=$(ifconfig $net_interface | grep 'HW' | sed 's/^.*HWaddr //g')
 
-    show_info "$select_eth_echo_4"
+    show_info "$select_eth_echo_4 $net_address"
 #   show_info "net_address is $net_address"
-    show_info "$select_eth_echo_5"
+    show_info "$select_eth_echo_5 $net_MacAddr"
 #   show_info "net_MacAddr is $net_MacAddr"
   fi
@@ -263,8 +302,11 @@
 
 
-#function show_master_info () {
+function show_master_info () {
+  show_info "$show_master_info_echo_1 $MasterIP_Address"
+  show_info "$show_master_info_echo_2 $net_MacAddr"
+
 #  show_info "The Master IP Address is $MasterIP_Address"
 #  show_info "The Master MacAddr is $net_MacAddr"
-#}
+}
 
 function make_ssh_key () {
@@ -305,27 +347,27 @@
 # 修改nutch-site.xml中-http.agent.url, http.agent.email
 function set_nutch-site () {
-  debug_info "$set_haoop_site_echo_1"
+  debug_info "$set_nutch_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_nutch_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_nutch_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_nutch_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_nutch_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_nutch_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_nutch_site_echo_7"
 # debug_info "debug...edit http.agent.email done..."
-  debug_info "$set_haoop_site_echo_8"
+  debug_info "$set_nutch_site_echo_8"
 # debug_info "set nutch-site.xml(done!)"
 }
@@ -353,7 +395,7 @@
 
 function Install_Nutch () {
-  debug_info "$install_Nutch_echo_1"
+  debug_info "$install_Nutch_echo_1 $MasterIP_Address "
 # debug_info "MasterIP_Address=$MasterIP_Address"
-  debug_info "$install_Nutch_echo_2"
+  debug_info "$install_Nutch_echo_2 $(hostname)"
 # debug_info "Master_Hostname=$(hostname)"
   su nutchuser -c "echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
@@ -393,5 +435,5 @@
 function client_PassMasterIPAddr_for_Remove () {
   cd $Start_PATH
-  Line_NO=`cat client_remove.sh grep -n '# Master IP here' | sed 's/:.*//g'`
+  Line_NO=`cat client_remove.sh | grep -n "# Master IP here" | sed 's/:.*//g'`
   sed -i ''$((Line_NO+1))'d' client_remove.sh
   sed -i ''$Line_NO'a Master_IP_Address='$MasterIP_Address'' client_remove.sh
@@ -425,9 +467,8 @@
 
   i=10
+  debug_info "$start_up_tomcat_echo_2"
   until [ $i -lt 1 ]
     do
       sleep 1s
-      debug_info "$start_up_tomcat_echo_2"
-#     debug_info "wait $i sec..."
       i=`expr $i - 1`
     done
Index: /nutchez-0.2/src/test/install_lang.zh
===================================================================
--- /nutchez-0.2/src/test/install_lang.zh	(revision 205)
+++ /nutchez-0.2/src/test/install_lang.zh	(revision 206)
@@ -11,6 +11,6 @@
 
 ## Lang for master_install ##
-main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定>密碼"
-main_echo_2="請確認上述的安裝資訊：1.正確 2.不正確"
+main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定密碼"
+main_echo_2="請確認上述的安裝資訊：1.正確 2.不正確 "
 main_echo_3="安裝成功！"
 main_echo_4="請進入管理頁面：http://$MasterIP_Address:8080"
@@ -65,4 +65,13 @@
 check_dialog_2="系統已有 dialog." 
 check_dialog_3="請安裝 dialog." 
+
+### [for creat_nutchuser_account()] ###
+create_nutchuser_d1="creat_nutchuser_account"
+create_nutchuser_1="請輸入 Master 上 nuchuser 使用者的密碼: "
+create_nutchuser_2="請再輸入一次: "
+create_nutchuser_3="兩次密碼一致"
+create_nutchuser_4="兩次密碼不一致，請重新輸入"
+create_nutchuser_s1="系統已經有 nutchuser，直接更改 nuchuser 密碼"
+create_nutchuser_s2="建立 nuchuser 使用者並更改密碼"
 	 	 
 #
@@ -73,7 +82,11 @@
 select_eth_echo_1="系統偵測到目前擁有網卡如下："
 select_eth_echo_2="請選擇欲給nutchez使用的網卡(1/2/3)："
-select_eth_echo_3="您選擇的網卡為：$net_choice"
-select_eth_echo_4="Master網路IP位址為：$net_address"
-select_eth_echo_5="Master的MAC為：$net_MacAddr"
+select_eth_echo_3="您選擇的網卡為："
+select_eth_echo_4="Master網路IP位址為："
+select_eth_echo_5="Master的MAC為："
+
+#
+show_master_info_echo_1="主機的IP位址為："
+show_master_info_echo_2="主機的hostname為："
 
 #
@@ -87,9 +100,9 @@
 #
 set_nutch_site_echo_1="正在設定nutch-site.xml..."
-set_nutch_site_echo_2="http.agent.url 設定行號為：$Line_NO..."
-set_nutch_site_echo_3="編輯http.agent.url, 刪除行號 $Line_NO."
+set_nutch_site_echo_2="http.agent.url 設定行號為"
+set_nutch_site_echo_3="編輯http.agent.url, 刪除行號"
 set_nutch_site_echo_4="編輯http.agent.url完成"
-set_nutch_site_echo_5="http.agent.email 設定行號為：$Line_NO."
-set_nutch_site_echo_6="編輯http.agent.email, 刪除行號 $Line_NO."
+set_nutch_site_echo_5="http.agent.email 設定行號"
+set_nutch_site_echo_6="編輯http.agent.email, 刪除行號"
 set_nutch_site_echo_7="編輯http.agent.email完成"
 set_nutch_site_echo_8="hadoop-site.xml設定完成"
@@ -110,10 +123,10 @@
 
 #
-client_PassMasterIPAddr_echo_1="在client安裝檔修改MasterIP的行號: $Line_NO"
+client_PassMasterIPAddr_echo_1="在client安裝檔修改MasterIP"
 client_PassMasterIPAddr_echo_2="編輯MasterIP..."
 client_PassMasterIPAddr_echo_3="完成編輯MasterIP."
 
 #
-client_PassMaster_Hostname_echo_1="在client安裝檔修改Hostname, 行號為: $Line_NO"
+client_PassMaster_Hostname_echo_1="在client安裝檔修改Hostname"
 client_PassMaster_Hostname_echo_2="編輯Hostname..."
 client_PassMaster_Hostname_echo_3="完成編輯Hostname."
@@ -124,5 +137,5 @@
 #
 start_up_tomcat_echo_1="啟動tomcat..."
-start_up_tomcat_echo_2="等待 $i 秒..."
+start_up_tomcat_echo_2="請等待約10秒..."
 start_up_tomcat_echo_3="tomcat 已經啟動！"
 
Index: /nutchez-0.2/src/test/lang_zh_TW_client_remove
===================================================================
--- /nutchez-0.2/src/test/lang_zh_TW_client_remove	(revision 205)
+++ /nutchez-0.2/src/test/lang_zh_TW_client_remove	(revision 206)
@@ -30,7 +30,7 @@
 
 # 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.取消"
+main_echo_3="請問是否確定移除此一節點：1.確定 2.取消 "
 main_echo_4="移除程序已完成！"
 main_echo_5="您已取消移除程序！"
Index: /nutchez-0.2/src/test/lang_zh_TW_master_remove
===================================================================
--- /nutchez-0.2/src/test/lang_zh_TW_master_remove	(revision 205)
+++ /nutchez-0.2/src/test/lang_zh_TW_master_remove	(revision 206)
@@ -32,6 +32,6 @@
 # main
 main_echo_1="警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
-main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"
+main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號,請先確認目前已無其他client服務仍在執行中。"
+main_echo_3="請問是否確定移除此一節點：1.確定 2.取消 "
 main_echo_4="移除程序已完成！"
 main_echo_5="您已取消移除程序！"
Index: /nutchez-0.2/src/test/master_remove.sh
===================================================================
--- /nutchez-0.2/src/test/master_remove.sh	(revision 205)
+++ /nutchez-0.2/src/test/master_remove.sh	(revision 206)
@@ -9,5 +9,5 @@
 #   
 
-# source ./lang_zh_TW_master_remove
+source ./lang_zh_TW_master_remove
 
 ##########  echo function  ##########
@@ -50,4 +50,5 @@
   show_info "$shutdown_service_echo_2" # "關閉本機服務..."
   su nutchuser -c "/opt/nutchez/nutch/bin/stop-all.sh"
+  su nutchuser -c "/opt/nutchez/tomcat/bin/shutdown.sh"
   show_info "$shutdown_service_echo_3" # "本機服務已關閉"
 }
@@ -56,6 +57,6 @@
 function remove_folders () {
   show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
-  rm -rf /opt/nutchez/*
-  rm -rf /var/nutchez/*
+  rm -rf /opt/nutchez
+  rm -rf /var/nutchez
   show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
 }
@@ -79,5 +80,5 @@
 function user_delete () {
   show_info "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
-  userdel -r nutcheruser
+  userdel -r nutchuser
   show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
 }