Index: /nutchez-0.2/src/shell/client_install_func.sh
===================================================================
--- /nutchez-0.2/src/shell/client_install_func.sh	(revision 231)
+++ /nutchez-0.2/src/shell/client_install_func.sh	(revision 232)
@@ -274,4 +274,5 @@
   mkdir /opt/nutchez
   mkdir /var/nutchez
+  mkdir /var/nutchez/logs
   mkdir /home/nutchuser/nutchez
   mkdir /home/nutchuser/nutchez/source
@@ -294,4 +295,5 @@
   cp /etc/hosts /home/nutchuser/nutchez/system/hosts.bak
   sed -i '1a '$Master_IP_Address' '$Master_Hostname'' /etc/hosts
+
   #/opt/nutchez/nutch/bin/hadoop-daemon.sh start datanode
   #/opt/nutchez/nutch/bin/hadoop-daemon.sh start tasktracker
Index: /nutchez-0.2/src/shell/client_remove
===================================================================
--- /nutchez-0.2/src/shell/client_remove	(revision 232)
+++ /nutchez-0.2/src/shell/client_remove	(revision 232)
@@ -0,0 +1,100 @@
+#!/bin/bash
+# Program:
+#   remove shell script for client uninstall
+# Author:
+#   Waue, Shunfa, Rock {waue, shunfa, rock}@nchc.org.tw
+# Version:
+#    1.0
+# History:
+#    
+
+
+source /home/nutchuser/nutchez/system/lang_link
+# 需要 master_install 設定的參數區
+# Master IP here
+Master_IP_Address=input.your.master.ip_address
+# Master Hostname here
+Master_Hostname=input_your_master_hostname
+
+##########  echo function  ##########
+function debug_info () {
+  if [ $? -eq 0 ]; then
+    echo -e "\033[1;35;40m info - $1 \033[0m"
+  fi
+}
+
+
+function show_info () {
+  if [ $? -eq 0 ]; then
+    echo -e "\033[1;32;40m $1 \033[0m"
+  fi
+}
+##########end echo function ##########
+
+# check root
+function check_root(){
+  debug_info "check_root"
+  if [ $USER != "root" ]; then
+    show_info "$CR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
+    exit
+  fi
+  show_info "$CR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
+}
+
+# shutdown service
+function shutdown_service () {
+  show_info "$CR_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 "$CR_shutdown_service_echo_2" # "本機服務已關閉"
+}
+
+# 移除檔案及資料夾
+function remove_folders () {
+  show_info "$CR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
+  rm -rf /opt/nutchez
+  rm -rf /var/nutchez
+  show_info "$CR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
+}
+
+
+# 還原/etc/hosts
+function edit_hosts () {
+  show_info "$CR_edit_hosts_echo_1" # "修改/etc/hosts..."
+#  Line_NO=`cat /etc/hosts | grep -n $Master_IP_Address | sed 's/:.*//g'`
+#  if [[ $Line_NO -ge 1 ]]; then
+#    sed -i ''$Line_NO'd' /etc/hosts
+#  fi
+  cat > /etc/hosts < /home/nutchuser/nutchez/system/hosts.bak
+  show_info "$CR_edit_hosts_echo_2" # "完成修改/etc/hosts"
+}
+
+
+# 移除使用者
+function user_delete () {
+  show_info "$CR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
+  userdel -r nutchuser
+  show_info "$CR_user_delete_echo_2" # "使用者nutchuser已刪除"
+}
+
+# Main function
+function main () {
+  check_root
+  show_info "$CR_main_echo_1" #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+  show_info "$CR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
+# 詢問是否繼續
+  read -p "$CR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
+# 確認移除
+  if [ $confirm -eq 1 ]; then
+    shutdown_service
+    remove_folders
+    edit_hosts
+    user_delete
+    show_info "$CR_main_echo_4" # "移除程序已完成！"
+  elif [ $confirm -eq 2 ]; then
+    show_info "$CR_main_echo_5" # "您已取消移除程序！"
+    show_info "$CR_main_echo_6" # "若要移除請再重新執行！"
+  fi
+}
+
+main
Index: tchez-0.2/src/shell/client_remove.sh
===================================================================
--- /nutchez-0.2/src/shell/client_remove.sh	(revision 231)
+++ 	(revision )
@@ -1,100 +1,0 @@
-#!/bin/bash
-# Program:
-#   remove shell script for client uninstall
-# Author:
-#   Waue, Shunfa, Rock {waue, shunfa, rock}@nchc.org.tw
-# Version:
-#    1.0
-# History:
-#    
-
-
-source /home/nutchuser/nutchez/system/lang_link
-# 需要 master_install 設定的參數區
-# Master IP here
-Master_IP_Address=input.your.master.ip_address
-# Master Hostname here
-Master_Hostname=input_your_master_hostname
-
-##########  echo function  ##########
-function debug_info () {
-  if [ $? -eq 0 ]; then
-    echo -e "\033[1;35;40m info - $1 \033[0m"
-  fi
-}
-
-
-function show_info () {
-  if [ $? -eq 0 ]; then
-    echo -e "\033[1;32;40m $1 \033[0m"
-  fi
-}
-##########end echo function ##########
-
-# check root
-function check_root(){
-  debug_info "check_root"
-  if [ $USER != "root" ]; then
-    show_info "$CR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
-    exit
-  fi
-  show_info "$CR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
-}
-
-# shutdown service
-function shutdown_service () {
-  show_info "$CR_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 "$CR_shutdown_service_echo_2" # "本機服務已關閉"
-}
-
-# 移除檔案及資料夾
-function remove_folders () {
-  show_info "$CR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
-  rm -rf /opt/nutchez
-  rm -rf /var/nutchez
-  show_info "$CR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
-}
-
-
-# 還原/etc/hosts
-function edit_hosts () {
-  show_info "$CR_edit_hosts_echo_1" # "修改/etc/hosts..."
-#  Line_NO=`cat /etc/hosts | grep -n $Master_IP_Address | sed 's/:.*//g'`
-#  if [[ $Line_NO -ge 1 ]]; then
-#    sed -i ''$Line_NO'd' /etc/hosts
-#  fi
-  cat > /etc/hosts < /home/nutchuser/nutchez/system/hosts.bak
-  show_info "$CR_edit_hosts_echo_2" # "完成修改/etc/hosts"
-}
-
-
-# 移除使用者
-function user_delete () {
-  show_info "$CR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
-  userdel -r nutchuser
-  show_info "$CR_user_delete_echo_2" # "使用者nutchuser已刪除"
-}
-
-# Main function
-function main () {
-  check_root
-  show_info "$CR_main_echo_1" #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-  show_info "$CR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
-# 詢問是否繼續
-  read -p "$CR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
-# 確認移除
-  if [ $confirm -eq 1 ]; then
-    shutdown_service
-    remove_folders
-    edit_hosts
-    user_delete
-    show_info "$CR_main_echo_4" # "移除程序已完成！"
-  elif [ $confirm -eq 2 ]; then
-    show_info "$CR_main_echo_5" # "您已取消移除程序！"
-    show_info "$CR_main_echo_6" # "若要移除請再重新執行！"
-  fi
-}
-
-main
Index: /nutchez-0.2/src/shell/install_func.sh
===================================================================
--- /nutchez-0.2/src/shell/install_func.sh	(revision 231)
+++ /nutchez-0.2/src/shell/install_func.sh	(revision 232)
@@ -443,7 +443,7 @@
 function client_PassMasterIPAddr_for_Remove () {
   cd $Work_Path
-  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
+  Line_NO=`cat client_remove | grep -n "# Master IP here" | sed 's/:.*//g'`
+  sed -i ''$((Line_NO+1))'d' client_remove
+  sed -i ''$Line_NO'a Master_IP_Address='$MasterIP_Address'' client_remove
 }
 
@@ -467,8 +467,8 @@
   # 複製檔案至$User_HOME/source目錄下
   mv NutchezForClientOf_$MasterIP_Address.tar.gz /home/nutchuser/nutchez/source
-  cp $Work_Path/client_install $Work_Path/client_install_func.sh $Work_Path/client_remove.sh $Work_Path/lang_link  /home/nutchuser/nutchez/source
+  cp $Work_Path/client_install $Work_Path/client_install_func.sh $Work_Path/client_remove $Work_Path/lang_link  /home/nutchuser/nutchez/source
   cp -r $Work_Path/lang /home/nutchuser/nutchez/source
   cp -r $Work_Path/lang /home/nutchuser/nutchez/system
-  cp $Work_Path/nutchez $Work_Path/lang_link $Work_Path/add_hosts $Work_Path/duplicate_del $Work_Path/master_remove.sh /home/nutchuser/nutchez/system
+  cp $Work_Path/nutchez $Work_Path/lang_link $Work_Path/add_hosts $Work_Path/duplicate_del $Work_Path/master_remove /home/nutchuser/nutchez/system
   
   # 複製 nutchez/source 到使用者的安裝資料夾
@@ -478,5 +478,5 @@
    
 #  cp $Work_Path/client_install $Work_Path/client_install /home/nutchuser/nutchez/source
-#  cp $Work_Path/client_install $Work_Path/client_remove.sh /home/nutchuser/nutchez/source
+#  cp $Work_Path/client_install $Work_Path/client_remove /home/nutchuser/nutchez/source
 #  cp $Work_Path/client_install $Work_Path/lang* /home/nutchuser/nutchez/source
 }
Index: /nutchez-0.2/src/shell/master_remove
===================================================================
--- /nutchez-0.2/src/shell/master_remove	(revision 232)
+++ /nutchez-0.2/src/shell/master_remove	(revision 232)
@@ -0,0 +1,122 @@
+#!/bin/bash
+# Program:
+#   remove shell script for master uninstall
+# Author:
+#   Waue, Shunfa, Rock {waue, shunfa, rock}@nchc.org.tw
+# Version:
+#    1.0
+# History:
+#   
+
+source /home/nutchuser/nutchez/system/lang_link
+
+##########  echo function  ##########
+function debug_info () {
+  if [ $? -eq 0 ]; then
+    echo -e "\033[1;35;40m info - $1 \033[0m"
+  fi
+}
+
+
+function show_info () {
+  if [ $? -eq 0 ]; then
+    echo -e "\033[1;32;40m $1 \033[0m"
+  fi
+}
+##########end echo function ##########
+
+nutch_PATH=/home/nutchuser/nutchez/system
+
+
+# check root
+function check_root(){
+  debug_info "check_root"
+  if [ $USER != "root" ]; then
+    show_info "$MR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
+    exit
+  fi
+  show_info "$MR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
+}
+
+# shutdown service
+function shutdown_service () {
+  show_info "$MR_shutdown_service_echo_1" # "停止其他尚未關閉的slaves服務..."
+  slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
+  
+  for nutch_node in $slaves_list
+  do
+    show_info "驗證叢集狀態"
+#   TaskTrackerStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep TaskTracker |sed 's/[0-9]* //g'"`
+#   DataNodeStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep DataNode |sed 's/[0-9]* //g'"`
+
+    if [ $(ssh -o StrictHostKeyChecking=no nutchuser@$nutch_node "jps |grep TaskTracker |sed 's/[0-9]* //g'") == "TaskTracker" ]; then
+       show_info "TaskTracker@$nutch_node is running, we will shutdown it!"
+       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
+    fi
+
+    if [ $(ssh -o StrictHostKeyChecking=no nutchuser@$nutch_node "jps |grep DataNode |sed 's/[0-9]* //g'") == "DataNode" ]; then
+       show_info "DataNode@$nutch_node is running, we will shutdown it!"
+       show_info "Shutdown $nutch_node."
+       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop datanode"
+    fi
+  done
+  show_info "$MR_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 "$MR_shutdown_service_echo_3" # "本機服務已關閉"
+}
+
+# 移除檔案及資料夾
+function remove_folders () {
+  rm /usr/local/bin/nutchez
+  show_info "$MR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
+  rm -rf /opt/nutchez
+  rm -rf /var/nutchez
+  show_info "$MR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
+}
+
+
+# 還原/etc/hosts
+function edit_hosts () {
+  show_info "$MR_edit_hosts_echo_1" # "修改/etc/hosts..."
+#  slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
+#  for nutch_node in $slaves_list
+#  do
+#    Line_NO=`cat /etc/hosts | grep -n $nutch_node | sed 's/:.*//g'`
+#    if [[ $Line_NO -ge 1 ]]; then
+#      sed -i ''$Line_NO'd' /etc/hosts
+#    fi
+#  done
+  cat > /etc/hosts < /home/nutchuser/nutchez/system/hosts.bak
+  show_info "$MR_edit_hosts_echo_2" # "完成修改/etc/hosts"
+}
+
+# 移除使用者
+function user_delete () {
+  show_info "$MR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
+  userdel -rf nutchuser
+  show_info "$MR_user_delete_echo_2" # "使用者nutchuser已刪除"
+}
+
+# Main function
+function main () {
+  check_root
+  show_info "$MR_main_echo_1" #"警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+  show_info "$MR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
+# 詢問是否繼續
+  read -p "$MR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
+# 確認移除
+  if [ $confirm -eq 1 ]; then
+    shutdown_service
+    remove_folders
+    edit_hosts
+    user_delete
+    show_info "$MR_main_echo_4" # "移除程序已完成！"
+  elif [ $confirm -eq 2 ]; then
+    show_info "$MR_main_echo_5" # "您已取消移除程序！"
+    show_info "$MR_main_echo_6" # "若要移除請再重新執行！"
+  fi
+}
+
+main
+
Index: tchez-0.2/src/shell/master_remove.sh
===================================================================
--- /nutchez-0.2/src/shell/master_remove.sh	(revision 231)
+++ 	(revision )
@@ -1,122 +1,0 @@
-#!/bin/bash
-# Program:
-#   remove shell script for master uninstall
-# Author:
-#   Waue, Shunfa, Rock {waue, shunfa, rock}@nchc.org.tw
-# Version:
-#    1.0
-# History:
-#   
-
-source /home/nutchuser/nutchez/system/lang_link
-
-##########  echo function  ##########
-function debug_info () {
-  if [ $? -eq 0 ]; then
-    echo -e "\033[1;35;40m info - $1 \033[0m"
-  fi
-}
-
-
-function show_info () {
-  if [ $? -eq 0 ]; then
-    echo -e "\033[1;32;40m $1 \033[0m"
-  fi
-}
-##########end echo function ##########
-
-nutch_PATH=/home/nutchuser/nutchez/system
-
-
-# check root
-function check_root(){
-  debug_info "check_root"
-  if [ $USER != "root" ]; then
-    show_info "$MR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
-    exit
-  fi
-  show_info "$MR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
-}
-
-# shutdown service
-function shutdown_service () {
-  show_info "$MR_shutdown_service_echo_1" # "停止其他尚未關閉的slaves服務..."
-  slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
-  
-  for nutch_node in $slaves_list
-  do
-    show_info "驗證叢集狀態"
-#   TaskTrackerStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep TaskTracker |sed 's/[0-9]* //g'"`
-#   DataNodeStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep DataNode |sed 's/[0-9]* //g'"`
-
-    if [ $(ssh -o StrictHostKeyChecking=no nutchuser@$nutch_node "jps |grep TaskTracker |sed 's/[0-9]* //g'") == "TaskTracker" ]; then
-       show_info "TaskTracker@$nutch_node is running, we will shutdown it!"
-       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
-    fi
-
-    if [ $(ssh -o StrictHostKeyChecking=no nutchuser@$nutch_node "jps |grep DataNode |sed 's/[0-9]* //g'") == "DataNode" ]; then
-       show_info "DataNode@$nutch_node is running, we will shutdown it!"
-       show_info "Shutdown $nutch_node."
-       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop datanode"
-    fi
-  done
-  show_info "$MR_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 "$MR_shutdown_service_echo_3" # "本機服務已關閉"
-}
-
-# 移除檔案及資料夾
-function remove_folders () {
-  rm /usr/local/bin/nutchez
-  show_info "$MR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
-  rm -rf /opt/nutchez
-  rm -rf /var/nutchez
-  show_info "$MR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
-}
-
-
-# 還原/etc/hosts
-function edit_hosts () {
-  show_info "$MR_edit_hosts_echo_1" # "修改/etc/hosts..."
-#  slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
-#  for nutch_node in $slaves_list
-#  do
-#    Line_NO=`cat /etc/hosts | grep -n $nutch_node | sed 's/:.*//g'`
-#    if [[ $Line_NO -ge 1 ]]; then
-#      sed -i ''$Line_NO'd' /etc/hosts
-#    fi
-#  done
-  cat > /etc/hosts < /home/nutchuser/nutchez/system/hosts.bak
-  show_info "$MR_edit_hosts_echo_2" # "完成修改/etc/hosts"
-}
-
-# 移除使用者
-function user_delete () {
-  show_info "$MR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
-  userdel -rf nutchuser
-  show_info "$MR_user_delete_echo_2" # "使用者nutchuser已刪除"
-}
-
-# Main function
-function main () {
-  check_root
-  show_info "$MR_main_echo_1" #"警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-  show_info "$MR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
-# 詢問是否繼續
-  read -p "$MR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
-# 確認移除
-  if [ $confirm -eq 1 ]; then
-    shutdown_service
-    remove_folders
-    edit_hosts
-    user_delete
-    show_info "$MR_main_echo_4" # "移除程序已完成！"
-  elif [ $confirm -eq 2 ]; then
-    show_info "$MR_main_echo_5" # "您已取消移除程序！"
-    show_info "$MR_main_echo_6" # "若要移除請再重新執行！"
-  fi
-}
-
-main
-