Index: /nutchez-0.2/src/test/client_install_func.sh
===================================================================
--- /nutchez-0.2/src/test/client_install_func.sh (revision 212)
+++ /nutchez-0.2/src/test/client_install_func.sh (revision 213)
@@ -282,4 +282,5 @@
debug_info "$install_nutch_package_d1"
tar -zxvf /home/nutchuser/nutchez/source/NutchezForClientOf_$Master_IP_Address.tar.gz -C /opt/nutchez
+ 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
Index: /nutchez-0.2/src/test/client_remove.sh
===================================================================
--- /nutchez-0.2/src/test/client_remove.sh (revision 212)
+++ /nutchez-0.2/src/test/client_remove.sh (revision 213)
@@ -36,24 +36,24 @@
debug_info "check_root"
if [ $USER != "root" ]; then
- show_info "$check_root_1" # "請切換成 root 身份執行移除程式!!!"
+ show_info "$CR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
exit
fi
- show_info "$check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
+ show_info "$CR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
}
# shutdown service
function shutdown_service () {
- show_info "$shutdown_service_echo_1" # "關閉本機服務..."
+ 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 "$shutdown_service_echo_2" # "本機服務已關閉"
+ show_info "$CR_shutdown_service_echo_2" # "本機服務已關閉"
}
# 移除檔案及資料夾
function remove_folders () {
- show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
+ show_info "$CR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
rm -rf /opt/nutchez
rm -rf /var/nutchez
- show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
+ show_info "$CR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
}
@@ -61,10 +61,11 @@
# 還原/etc/hosts
function edit_hosts () {
- show_info "$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
- show_info "$edit_hosts_echo_2" # "完成修改/etc/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"
}
@@ -72,15 +73,15 @@
# 移除使用者
function user_delete () {
- show_info "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
+ show_info "$CR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
userdel -r nutchuser
- show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
+ show_info "$CR_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 "$CR_main_echo_1" #"警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+ show_info "$CR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
# 詢問是否繼續
- read -p "$main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
+ read -p "$CR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
# 確認移除
if [ $confirm -eq 1 ]; then
@@ -90,8 +91,8 @@
edit_hosts
user_delete
- show_info "$main_echo_4" # "移除程序已完成！"
+ show_info "$CR_main_echo_4" # "移除程序已完成！"
elif [ $confirm -eq 2 ]; then
- show_info "$main_echo_5" # "您已取消移除程序！"
- show_info "$main_echo_6" # "若要移除請再重新執行！"
+ show_info "$CR_main_echo_5" # "您已取消移除程序！"
+ show_info "$CR_main_echo_6" # "若要移除請再重新執行！"
fi
}
Index: /nutchez-0.2/src/test/install
===================================================================
--- /nutchez-0.2/src/test/install (revision 212)
+++ /nutchez-0.2/src/test/install (revision 213)
@@ -14,5 +14,5 @@
# Source functions
source $Work_Path/install_func.sh
-source $Work_Path/install_lang.zh
+source $Work_Path/lang_link
### real code #####
@@ -28,9 +28,9 @@
main () {
check_info
- show_info "$main_echo_1"
+ show_info "$MI_main_echo_1"
# show_info "歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定密碼"
set_install_information
show_master_info
- read -p "$main_echo_2" confirm
+ read -p "$MI_main_echo_2" confirm
# read -p "Please confirm your install infomation: 1.Yes 2.No " confirm
if [ $confirm -eq 1 ]; then
@@ -39,5 +39,12 @@
# 解壓縮
tar -zxvf nutchezV2-current.tar.gz -C /opt/
-
+
+ su nutchuser -c "mkdir /home/nutchuser/nutchez"
+ su nutchuser -c "mkdir /home/nutchuser/nutchez/urls"
+ su nutchuser -c "touch /home/nutchuser/nutchez/urls/urls.txt"
+ su nutchuser -c "mkdir /home/nutchuser/nutchez/search"
+ su nutchuser -c "mkdir /home/nutchuser/nutchez/source"
+ su nutchuser -c "mkdir /home/nutchuser/nutchez/system"
+
Install_Nutch
@@ -45,10 +52,4 @@
chown -R nutchuser:nutchuser /opt/nutchez
chown -R nutchuser:nutchuser /var/nutchez
- su nutchuser -c "mkdir /home/nutchuser/nutchez"
- su nutchuser -c "mkdir /home/nutchuser/nutchez/urls"
- su nutchuser -c "touch /home/nutchuser/nutchez/urls/urls.txt"
- 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
@@ -58,7 +59,7 @@
start_up_tomcat
# 安裝流程結束，並進入網頁管理頁面設定爬網網址...等
- show_info "$main_echo_3"
+ show_info "$MI_main_echo_3"
# show_info "Install Successfully!!"
- show_info "$main_echo_4"
+ show_info "$MI_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 212)
+++ /nutchez-0.2/src/test/install_func.sh (revision 213)
@@ -1,4 +1,4 @@
#!/bin/bash
-source $Work_Path/install_lang
+source $Work_Path/lang_link
####### garbage here #############
function mainFunction ( )
@@ -65,13 +65,13 @@
debug_info "check_root"
if [ $USER != "root" ]; then
- show_info "$check_root_1"
+ show_info "$MI_check_root_1"
exit
fi
- show_info "$check_root_2"
+ show_info "$MI_check_root_2"
}
function check_systemInfo(){
- debug_info "$check_sys_1"
- show_info "$check_sys_2"
+ debug_info "$MI_check_sys_1"
+ show_info "$MI_check_sys_2"
Linux_Distribution=$(lsb_release -a 2> /dev/null | grep "Distributor ID:" | awk '{print $3}')
Linux_Version=$(lsb_release -a 2> /dev/null | grep "Release" | awk '{print $2}')
@@ -81,30 +81,30 @@
function install_packages(){
# deb 系列系統
- debug_info "$install_pack_1"
- debug_info "$install_pack_2"
+ debug_info "$MI_install_pack_1"
+ debug_info "$MI_install_pack_2"
if [ "$Linux_Distribution" == "Ubuntu" ] || [ "$Linux_Distribution" == "Debian" ] ;then
- echo -e "\n$install_pack_if_1\n"
+ echo -e "\n$MI_install_pack_if_1\n"
aptitude install -y expect ssh dialog
# rpm 系列系統
elif [ "$Linux_Distribution" == "Fedora" ] || [ "$Linux_Distribution" == "CentOS" ] ;then
- show_info "$install_pack_if_2"
- else
- show_info "$install_pack_if_2"
+ show_info "$MI_install_pack_if_2"
+ else
+ show_info "$MI_install_pack_if_2"
fi
}
function check_nez_installed(){
- debug_info "$check_nez_1"
+ debug_info "$MI_check_nez_1"
if [ -d "/opt/nutchez" ]; then
- show_info "$check_nez_2"
+ show_info "$MI_check_nez_2"
exit
else
- show_info "$check_nez_3"
+ show_info "$MI_check_nez_3"
fi
}
function check_sunJava(){
- debug_info "$check_sunJava_1"
- debug_info "$check_sunJava_2"
+ debug_info "$MI_check_sunJava_1"
+ debug_info "$MI_check_sunJava_2"
javaPath="/usr"
@@ -118,15 +118,15 @@
if [ "$JAVA_org" == "" ]; then
- show_info "$check_sunJava_if_1"
- show_info "$check_sunJava_if_2"
- show_info "$check_sunJava_if_3"
- read -p "$check_sunJava_if_4" choice
+ show_info "$MI_check_sunJava_if_1"
+ show_info "$MI_check_sunJava_if_2"
+ show_info "$MI_check_sunJava_if_3"
+ read -p "$MI_check_sunJava_if_4" choice
case $choice in
"1")
- show_info "$check_sunJava_if_5"
+ show_info "$MI_check_sunJava_if_5"
exit
;;
"2")
- read -p "$check_sunJava_if_6" javaPath
+ read -p "$MI_check_sunJava_if_6" javaPath
;;
"*")
@@ -141,5 +141,5 @@
if [ "$JAVA_org" == "" ]; then
- show_info "$check_sunJava_if_7"
+ show_info "$MI_check_sunJava_if_7"
exit
fi
@@ -149,11 +149,11 @@
large16=$(echo "$JAVA_version >= 1.6" | bc)
if [ "${large16}" == 0 ]; then
- show_info "$check_sunJava_if_8"
+ show_info "$MI_check_sunJava_if_8"
exit
fi
- show_info "$check_sunJava_if_9"
- else
- show_info "$check_sunJava_if_10"
+ show_info "$MI_check_sunJava_if_9"
+ else
+ show_info "$MI_check_sunJava_if_10"
exit
fi
@@ -165,16 +165,16 @@
# 檢查是否有安裝openssh, openssh-server
function check_ssh(){
- debug_info "$check_ssh_1"
+ debug_info "$MI_check_ssh_1"
if [ -e /usr/bin/ssh ]; then
- show_info "$check_ssh_2"
- else
- show_info "$check_ssh_3"
+ show_info "$MI_check_ssh_2"
+ else
+ show_info "$MI_check_ssh_3"
exit
fi
if [ -e /usr/sbin/sshd ]; then
- show_info "$check_ssh_4"
- else
- show_info "$check_ssh_5"
+ show_info "$MI_check_ssh_4"
+ else
+ show_info "$MI_check_ssh_5"
exit
fi
@@ -184,9 +184,9 @@
# 檢查是否有安裝dialog
function check_dialog(){
- debug_info "$check_dialog_1"
+ debug_info "$MI_check_dialog_1"
if [ -e /usr/bin/dialog ]; then
- show_info "$check_dialog_2"
- else
- show_info "$check_dialog_3"
+ show_info "$MI_check_dialog_2"
+ else
+ show_info "$MI_check_dialog_3"
exit
fi
@@ -210,8 +210,8 @@
function set_nutchuser_passwd () {
- read -sp "$set_nutchuser_passwd_echo_1" Nutchuser_Passwd
+ read -sp "$MI_set_nutchuser_passwd_echo_1" Nutchuser_Passwd
# read -sp "Please enter nutchuser's password : " Nutchuser_Passwd
echo -e "\n"
- read -sp "$set_nutchuser_passwd_echo_2" Nutchuser_Passwd2
+ read -sp "$MI_set_nutchuser_passwd_echo_2" Nutchuser_Passwd2
# read -sp "Please enter nutchuser's password again: " Nutchuser_Passwd2
echo -e "\n"
@@ -273,5 +273,5 @@
else
declare -i i=1
- show_info "$select_eth_echo_1"
+ show_info "$MI_select_eth_echo_1"
# show_info "\nSystem have multiple network device, which network use for this machine: "
@@ -281,5 +281,5 @@
i=i+1
done
- read -p "$select_eth_echo_2" net_choice
+ read -p "$MI_select_eth_echo_2" net_choice
# read -p "Please choice(1/2/3...): " net_choice
if [ -z $net_choice ]; then
@@ -287,5 +287,5 @@
fi
- show_info "$select_eth_echo_3 $net_choice"
+ show_info "$MI_select_eth_echo_3 $net_choice"
# show_info "Your choice is $net_choice"
net_interface=$(echo $net_interfaces | cut -d " " -f $net_choice)
@@ -294,7 +294,7 @@
net_MacAddr=$(ifconfig $net_interface | grep 'HW' | sed 's/^.*HWaddr //g')
- show_info "$select_eth_echo_4 $net_address"
+ show_info "$MI_select_eth_echo_4 $net_address"
# show_info "net_address is $net_address"
- show_info "$select_eth_echo_5 $net_MacAddr"
+ show_info "$MI_select_eth_echo_5 $net_MacAddr"
# show_info "net_MacAddr is $net_MacAddr"
fi
@@ -303,6 +303,6 @@
function show_master_info () {
- show_info "$show_master_info_echo_1 $MasterIP_Address"
- show_info "$show_master_info_echo_2 $net_MacAddr"
+ show_info "$MI_show_master_info_echo_1 $MasterIP_Address"
+ show_info "$MI_show_master_info_echo_2 $net_MacAddr"
# show_info "The Master IP Address is $MasterIP_Address"
@@ -311,10 +311,10 @@
function make_ssh_key () {
- debug_info "$make_ssh_key_echo_1"
+ debug_info "$MI_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 "$MI_make_ssh_key_echo_2"
# debug_info "Make ssh key(done!)"
}
@@ -322,5 +322,5 @@
function set_haoop-site () {
- debug_info "$set_haoop_site_echo_1"
+ debug_info "$MI_set_haoop_site_echo_1"
# debug_info "set hadoop-site.xml(begin...)"
cd $Nutch_HOME/conf/
@@ -341,5 +341,5 @@
EOF
- debug_info "$set_haoop_site_echo_2"
+ debug_info "$MI_set_haoop_site_echo_2"
# debug_info "set hadoop-site.xml(done!)"
}
@@ -347,38 +347,38 @@
# 修改nutch-site.xml中-http.agent.url, http.agent.email
function set_nutch-site () {
- debug_info "$set_nutch_site_echo_1"
+ debug_info "$MI_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_nutch_site_echo_2"
+ debug_info "$MI_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_nutch_site_echo_3"
+ debug_info "$MI_set_nutch_site_echo_3"
# debug_info "debug...edit http.agent.url delete line $((Line_NO+1))..."
sed -i ''$Line_NO'a '$MasterIP_Address'' $Nutch_HOME/conf/nutch-site.xml
- debug_info "$set_nutch_site_echo_4"
+ debug_info "$MI_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_nutch_site_echo_5"
+ debug_info "$MI_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_nutch_site_echo_6"
+ debug_info "$MI_set_nutch_site_echo_6"
# debug_info "debug...edit http.agent.email delete line $((Line_NO+1))..."
sed -i ''$Line_NO'a '$Admin_email'' $Nutch_HOME/conf/nutch-site.xml
- debug_info "$set_nutch_site_echo_7"
+ debug_info "$MI_set_nutch_site_echo_7"
# debug_info "debug...edit http.agent.email done..."
- debug_info "$set_nutch_site_echo_8"
+ debug_info "$MI_set_nutch_site_echo_8"
# debug_info "set nutch-site.xml(done!)"
}
function format_HDFS () {
- debug_info "$format_HDFS_echo_1"
+ debug_info "$MI_format_HDFS_echo_1"
su nutchuser -c "$Nutch_HOME/bin/hadoop namenode -format"
- debug_info "$format_HDFS_echo_2"
+ debug_info "$MI_format_HDFS_echo_2"
}
function start_up_NutchEZ (){
- debug_info "$start_up_NutchEZ_echo_1"
+ debug_info "$MI_start_up_NutchEZ_echo_1"
# debug_info "start up NutchEZ..."
su nutchuser -c "$Nutch_HOME/bin/start-all.sh"
@@ -387,5 +387,6 @@
function set_hosts () {
- debug_info "$set_hosts_echo_1"
+ debug_info "$MI_set_hosts_echo_1"
+ cp /etc/hosts /home/nutchuser/nutchez/system/hosts.bak
Line_NO=`cat /etc/hosts | grep -n $(hostname) | sed 's/:.*//g'`
content=$(cat /etc/hosts | awk 'NR=='$Line_NO'{printf "# " ; print}' )
@@ -395,7 +396,7 @@
function Install_Nutch () {
- debug_info "$install_Nutch_echo_1 $MasterIP_Address "
+ debug_info "$MI_install_Nutch_echo_1 $MasterIP_Address "
# debug_info "MasterIP_Address=$MasterIP_Address"
- debug_info "$install_Nutch_echo_2 $(hostname)"
+ debug_info "$MI_install_Nutch_echo_2 $(hostname)"
# debug_info "Master_Hostname=$(hostname)"
su nutchuser -c "echo $net_address $(hostname) $net_MacAddr \>\> ~/nutchez/system/nutch_nodes"
@@ -409,11 +410,11 @@
cd $Start_PATH
Line_NO=`cat client_install | grep -n '# Master IP here' | sed 's/:.*//g'`
- debug_info "$client_PassMasterIPAddr_echo_1"
+ debug_info "$MI_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 "$MI_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 "$MI_client_PassMasterIPAddr_echo_3"
# debug_info "edit client_install done..."
}
@@ -423,11 +424,11 @@
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 "$MI_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 "$MI_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 "$MI_client_PassMaster_Hostname_echo_3"
# debug_info "edit client_install done..."
}
@@ -448,5 +449,5 @@
# 打包安裝目錄(不含tomcat)
- debug_info "$make_client_install_echo_1"
+ debug_info "$MI_make_client_install_echo_1"
# debug_info "function make_client_install..."
@@ -460,12 +461,15 @@
mv NutchezForClientOf_$MasterIP_Address.tar.gz /home/nutchuser/nutchez/source
cp $Start_PATH/client_install $Start_PATH/client_install_func.sh /home/nutchuser/nutchez/source
+# cp $Start_PATH/client_install $Start_PATH/client_install /home/nutchuser/nutchez/source
+# cp $Start_PATH/client_install $Start_PATH/client_remove.sh /home/nutchuser/nutchez/source
+# cp $Start_PATH/client_install $Start_PATH/lang* /home/nutchuser/nutchez/source
}
function start_up_tomcat () {
- debug_info "$start_up_tomcat_echo_1"
+ debug_info "$MI_start_up_tomcat_echo_1"
# debug_info "start up tomcat..."
i=10
- debug_info "$start_up_tomcat_echo_2"
+ debug_info "$MI_start_up_tomcat_echo_2"
until [ $i -lt 1 ]
do
@@ -474,5 +478,5 @@
done
su nutchuser -c "$Tomcat_HOME/bin/startup.sh"
- debug_info "$start_up_tomcat_echo_3"
+ debug_info "$MI_start_up_tomcat_echo_3"
# debug_info "tomcat has been started..."
}
@@ -481,12 +485,11 @@
# 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 "$MI_client_install_commands_echo_1"
+ show_info "$MI_client_install_commands_echo_2"
+ show_info "$MI_client_install_commands_echo_3"
+ 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:"
Index: /nutchez-0.2/src/test/lang/lang_zh_TW
===================================================================
--- /nutchez-0.2/src/test/lang/lang_zh_TW (revision 212)
+++ /nutchez-0.2/src/test/lang/lang_zh_TW (revision 213)
@@ -10,128 +10,128 @@
############ Lang for master_install -Start ############
-main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定>密碼"
-main_echo_2="請確認上述的安裝資訊：1.正確 2.不正確"
-main_echo_3="安裝成功！"
-main_echo_4="請進入管理頁面：http://$MasterIP_Address:8080"
+MI_main_echo_1="歡迎使用NutchEZ, 此安裝程序會為您新建一個nutchuser帳號並協助您設定>密碼"
+MI_main_echo_2="請確認上述的安裝資訊：1.正確 2.不正確"
+MI_main_echo_3="安裝成功！"
+MI_main_echo_4="請進入管理頁面：http://$MasterIP_Address:8080"
## Lang for master_install_func.sh ##
### [for choose_lang()] ###
-choose_lang_1="請選擇語言: (1)English (2)中文"
-choose_lang_2="(1/2):"
+MI_choose_lang_1="請選擇語言: (1)English (2)中文"
+MI_choose_lang_2="(1/2):"
### [for check_root()]###
-check_root_1="請切換成 root 身份執行!!!"
-check_root_2="身份是 root"
+MI_check_root_1="請切換成 root 身份執行!!!"
+MI_check_root_2="身份是 root"
### [for check_systemInfo()]###
-check_sys_1="check_systemInfo"
-check_sys_2="作業系統為: "
+MI_check_sys_1="check_systemInfo"
+MI_check_sys_2="作業系統為: "
### [for install_packages()]###
-install_pack_1="install_packages"
-install_pack_2="檢查套件相依性"
-install_pack_if_1="將會安裝 expect, ssh 和 dialog 套件"
-install_pack_if_2="請手動安裝 expect, ssh 和 dialog 套件"
+MI_install_pack_1="install_packages"
+MI_install_pack_2="檢查套件相依性"
+MI_install_pack_if_1="將會安裝 expect, ssh 和 dialog 套件"
+MI_install_pack_if_2="請手動安裝 expect, ssh 和 dialog 套件"
### [for check_nez_installed()] ###
-check_nez_1="chcheck_nez_installed"
-check_nez_2="系統先前已安裝NutchEz"
-check_nez_3="系統尚未安裝 NutchEz"
+MI_check_nez_1="chcheck_nez_installed"
+MI_check_nez_2="系統先前已安裝NutchEz"
+MI_check_nez_3="系統尚未安裝 NutchEz"
### [for check_sunJava()] ###
-check_sunJava_1="check_sunJava"
-check_sunJava_2="NutchEz 需要 Sun Java JDK 1.6 以上的版本"
-check_sunJava_if_1="Java 並不是 Sun 版本, 請自行安裝 Sun 版本的 Java"
-check_sunJava_if_2="請輸入您的選擇: "
-check_sunJava_if_3="(1)系統沒有 Sun Java (2)Sun Java已安裝並於其他路徑 (3)結束"
-check_sunJava_if_4="請選擇 (1/2/3): "
-check_sunJava_if_5="請自行安裝 Sun Java 1.6 以上版本"
-check_sunJava_if_6="請輸入 Sum Java 的家路徑 (例如： '/usr/lib/jvm/java-6-sun-1.6.0.12'): "
-check_sunJava_if_7="Java 並不是 Sun 版本, 請自行安裝 Sun 版本的 Java"
-check_sunJava_if_8="Java 版本太舊 (請更新至 1.6 以上版本)"
-check_sunJava_if_9="系統有 Sun Java 1.6 以上版本"
-check_sunJava_if_10="請自行安裝 Sun Java 1.6 以上版本"
+MI_check_sunJava_1="check_sunJava"
+MI_check_sunJava_2="NutchEz 需要 Sun Java JDK 1.6 以上的版本"
+MI_check_sunJava_if_1="Java 並不是 Sun 版本, 請自行安裝 Sun 版本的 Java"
+MI_check_sunJava_if_2="請輸入您的選擇: "
+MI_check_sunJava_if_3="(1)系統沒有 Sun Java (2)Sun Java已安裝並於其他路徑 (3)結束"
+MI_check_sunJava_if_4="請選擇 (1/2/3): "
+MI_check_sunJava_if_5="請自行安裝 Sun Java 1.6 以上版本"
+MI_check_sunJava_if_6="請輸入 Sum Java 的家路徑 (例如： '/usr/lib/jvm/java-6-sun-1.6.0.12'): "
+MI_check_sunJava_if_7="Java 並不是 Sun 版本, 請自行安裝 Sun 版本的 Java"
+MI_check_sunJava_if_8="Java 版本太舊 (請更新至 1.6 以上版本)"
+MI_check_sunJava_if_9="系統有 Sun Java 1.6 以上版本"
+MI_check_sunJava_if_10="請自行安裝 Sun Java 1.6 以上版本"
### [for check_ssh()] ###
-check_ssh_1="check_ssh"
-check_ssh_2="系統已有 ssh."
-check_ssh_3="請安裝 ssh."
-check_ssh_4="系統已有 ssh Server (sshd)."
-check_ssh_5="請安裝 ssh Server (sshd)."
+MI_check_ssh_1="check_ssh"
+MI_check_ssh_2="系統已有 ssh."
+MI_check_ssh_3="請安裝 ssh."
+MI_check_ssh_4="系統已有 ssh Server (sshd)."
+MI_check_ssh_5="請安裝 ssh Server (sshd)."
### [for check_dialog()] ###
-check_dialog_1="check_dialog"
-check_dialog_2="系統已有 dialog."
-check_dialog_3="請安裝 dialog."
+MI_check_dialog_1="check_dialog"
+MI_check_dialog_2="系統已有 dialog."
+MI_check_dialog_3="請安裝 dialog."
#
-set_nutchuser_passwd_echo_1="請輸入欲設定的nutchuser密碼："
-set_nutchuser_passwd_echo_2="請再輸入一次確認密碼："
-
-#
-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"
-
-#
-make_ssh_key_echo_1="正在產生SSH Key... "
-make_ssh_key_echo_2="SSH Key已產生"
-
-#
-set_haoop_site_echo_1="正在設定hadoop-site.xml... "
-set_haoop_site_echo_2="hadoop-site.xml設定完成"
-
-#
-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_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_7="編輯http.agent.email完成"
-set_nutch_site_echo_8="hadoop-site.xml設定完成"
-
-#
-format_HDFS_echo_1="格式化HDFS..."
-format_HDFS_echo_2="格式化HDFS完成"
-
-#
-start_up_NutchEZ_echo_1="啟動NutchEZ..."
-
-#
-set_hosts_echo_1="設定master上的hosts"
-
-#
-install_Nutch_echo_1="Master的IP位址為："
-install_Nutch_echo_2="Master的Hostname為："
-
-#
-client_PassMasterIPAddr_echo_1="在client安裝檔修改MasterIP的行號: $Line_NO"
-client_PassMasterIPAddr_echo_2="編輯MasterIP..."
-client_PassMasterIPAddr_echo_3="完成編輯MasterIP."
-
-#
-client_PassMaster_Hostname_echo_1="在client安裝檔修改Hostname, 行號為: $Line_NO"
-client_PassMaster_Hostname_echo_2="編輯Hostname..."
-client_PassMaster_Hostname_echo_3="完成編輯Hostname."
-
-#
-make_client_install_echo_1="於function make_client_install ..."
-
-#
-start_up_tomcat_echo_1="啟動tomcat..."
-start_up_tomcat_echo_2="等待 $i 秒..."
-start_up_tomcat_echo_3="tomcat 已經啟動！"
-
-#
-client_install_commands_echo_1="Client安裝可參考以下指令："
-client_install_commands_echo_2="cd ~"
-client_install_commands_echo_3="mkdir nutchez_client_install"
-client_install_commands_echo_4="cd nutchez_client_install"
-client_install_commands_echo_5="scp nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/* ."
-client_install_commands_echo_6="sudo su"
-client_install_commands_echo_7="./client_install"
+MI_set_nutchuser_passwd_echo_1="請輸入欲設定的nutchuser密碼："
+MI_set_nutchuser_passwd_echo_2="請再輸入一次確認密碼："
+
+#
+MI_select_eth_echo_1="系統偵測到目前擁有網卡如下："
+MI_select_eth_echo_2="請選擇欲給nutchez使用的網卡(1/2/3)："
+MI_select_eth_echo_3="您選擇的網卡為：$net_choice"
+MI_select_eth_echo_4="Master網路IP位址為：$net_address"
+MI_select_eth_echo_5="Master的MAC為：$net_MacAddr"
+
+#
+MI_make_ssh_key_echo_1="正在產生SSH Key... "
+MI_make_ssh_key_echo_2="SSH Key已產生"
+
+#
+MI_set_haoop_site_echo_1="正在設定hadoop-site.xml... "
+MI_set_haoop_site_echo_2="hadoop-site.xml設定完成"
+
+#
+MI_set_nutch_site_echo_1="正在設定nutch-site.xml..."
+MI_set_nutch_site_echo_2="http.agent.url 設定行號為：$Line_NO..."
+MI_set_nutch_site_echo_3="編輯http.agent.url, 刪除行號 $Line_NO."
+MI_set_nutch_site_echo_4="編輯http.agent.url完成"
+MI_set_nutch_site_echo_5="http.agent.email 設定行號為：$Line_NO."
+MI_set_nutch_site_echo_6="編輯http.agent.email, 刪除行號 $Line_NO."
+MI_set_nutch_site_echo_7="編輯http.agent.email完成"
+MI_set_nutch_site_echo_8="hadoop-site.xml設定完成"
+
+#
+MI_format_HDFS_echo_1="格式化HDFS..."
+MI_format_HDFS_echo_2="格式化HDFS完成"
+
+#
+MI_start_up_NutchEZ_echo_1="啟動NutchEZ..."
+
+#
+MI_set_hosts_echo_1="設定master上的hosts"
+
+#
+MI_install_Nutch_echo_1="Master的IP位址為："
+MI_install_Nutch_echo_2="Master的Hostname為："
+
+#
+MI_client_PassMasterIPAddr_echo_1="在client安裝檔修改MasterIP的行號: $Line_NO"
+MI_client_PassMasterIPAddr_echo_2="編輯MasterIP..."
+MI_client_PassMasterIPAddr_echo_3="完成編輯MasterIP."
+
+#
+MI_client_PassMaster_Hostname_echo_1="在client安裝檔修改Hostname, 行號為: $Line_NO"
+MI_client_PassMaster_Hostname_echo_2="編輯Hostname..."
+MI_client_PassMaster_Hostname_echo_3="完成編輯Hostname."
+
+#
+MI_make_client_install_echo_1="於function make_client_install ..."
+
+#
+MI_start_up_tomcat_echo_1="啟動tomcat..."
+MI_start_up_tomcat_echo_2="等待約10秒..."
+MI_start_up_tomcat_echo_3="tomcat 已經啟動！"
+
+#
+MI_client_install_commands_echo_1="Client安裝可參考以下指令："
+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 nutchuser@$MasterIP_Address:/home/nutchuser/nutchez/source/* ."
+MI_client_install_commands_echo_6="sudo su"
+MI_client_install_commands_echo_7="./client_install"
########## Lang for Master Install - End##########
@@ -235,31 +235,31 @@
# check root
-check_root_1="請切換成 root 身份執行移除程式!!!"
-check_root_2="已確認為root身份, 將繼續執行此移除程式！"
+MR_check_root_1="請切換成 root 身份執行移除程式!!!"
+MR_check_root_2="已確認為root身份, 將繼續執行此移除程式！"
# shutdown service
-shutdown_service_echo_1="停止其他尚未關閉的slaves服務..."
-shutdown_service_echo_2="關閉本機服務..."
-shutdown_service_echo_3="本機服務已關閉"
+MR_shutdown_service_echo_1="停止其他尚未關閉的slaves服務..."
+MR_shutdown_service_echo_2="關閉本機服務..."
+MR_shutdown_service_echo_3="本機服務已關閉"
# remove_folders
-remove_folders_echo_1="正在刪除安裝時所建立的檔案及資料夾..."
-remove_folders_echo_2="安裝時所建立的檔案及資料夾已刪除"
+MR_remove_folders_echo_1="正在刪除安裝時所建立的檔案及資料夾..."
+MR_remove_folders_echo_2="安裝時所建立的檔案及資料夾已刪除"
# edit_hosts
-edit_hosts_echo_1="修改/etc/hosts..."
-edit_hosts_echo_2="完成修改/etc/hosts"
+MR_edit_hosts_echo_1="還原/etc/hosts...至安裝NutchEZ前的版本"
+MR_edit_hosts_echo_2="完成修改/etc/hosts"
# user_delete
-user_delete_echo_1="正在刪除nutchuser使用者..."
-user_delete_echo_2="使用者nutchuser已刪除"
+MR_user_delete_echo_1="正在刪除nutchuser使用者..."
+MR_user_delete_echo_2="使用者nutchuser已刪除"
# main
-main_echo_1="警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
-main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"
-main_echo_4="移除程序已完成！"
-main_echo_5="您已取消移除程序！"
-main_echo_6="若要移除請再重新執行！"
+MR_main_echo_1="警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+MR_main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
+MR_main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"
+MR_main_echo_4="移除程序已完成！"
+MR_main_echo_5="您已取消移除程序！"
+MR_main_echo_6="若要移除請再重新執行！"
########## Lang for Master Remove - End ##########
@@ -267,30 +267,30 @@
########## Lang for Client Remove - Start ##########
# check root
-check_root_1="請切換成 root 身份執行移除程式!!!"
-check_root_2="已確認為root身份, 將繼續執行此移除程式！"
+CR_check_root_1="請切換成 root 身份執行移除程式!!!"
+CR_check_root_2="已確認為root身份, 將繼續執行此移除程式！"
# shutdown service
-shutdown_service_echo_1="關閉本機服務..."
-shutdown_service_echo_2="本機服務已關閉"
+CR_shutdown_service_echo_1="關閉本機服務..."
+CR_shutdown_service_echo_2="本機服務已關閉"
# remove_folders
-remove_folders_echo_1="正在刪除安裝時所建立的檔案及資料夾..."
-remove_folders_echo_2="安裝時所建立的檔案及資料夾已刪除"
+CR_remove_folders_echo_1="正在刪除安裝時所建立的檔案及資料夾..."
+CR_remove_folders_echo_2="安裝時所建立的檔案及資料夾已刪除"
# edit_hosts
-edit_hosts_echo_1="修改/etc/hosts..."
-edit_hosts_echo_2="完成修改/etc/hosts"
+CR_edit_hosts_echo_1="還原/etc/hosts...至安裝NutchEZ前的版本"
+CR_edit_hosts_echo_2="完成修改/etc/hosts"
# user_delete
-user_delete_echo_1="正在刪除nutchuser使用者..."
-user_delete_echo_2="使用者nutchuser已刪除"
+CR_user_delete_echo_1="正在刪除nutchuser使用者..."
+CR_user_delete_echo_2="使用者nutchuser已刪除"
# main
-main_echo_1="警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
-main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
-main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"
-main_echo_4="移除程序已完成！"
-main_echo_5="您已取消移除程序！"
-main_echo_6="若要移除請再重新執行！"
+CR_main_echo_1="警告 - 此一程式為移除此用戶端的nutch node, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+CR_main_echo_2="本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號。"
+CR_main_echo_3="請問是否確定移除此一節點：1.確定 2.取消"
+CR_main_echo_4="移除程序已完成！"
+CR_main_echo_5="您已取消移除程序！"
+CR_main_echo_6="若要移除請再重新執行！"
########## Lang for Client Remove - End ##########
Index: /nutchez-0.2/src/test/language_choise.sh
===================================================================
--- /nutchez-0.2/src/test/language_choise.sh (revision 212)
+++ /nutchez-0.2/src/test/language_choise.sh (revision 213)
@@ -13,5 +13,6 @@
;;
zh)
- ln -sf ./install_lang.zh ./install_lang
+# ln -sf ./install_lang.zh ./install_lang
+ ln -sf lang/lang_zh_TW lang_link
echo "你選擇了中文"
break;
Index: /nutchez-0.2/src/test/master_remove.sh
===================================================================
--- /nutchez-0.2/src/test/master_remove.sh (revision 212)
+++ /nutchez-0.2/src/test/master_remove.sh (revision 213)
@@ -33,13 +33,13 @@
debug_info "check_root"
if [ $USER != "root" ]; then
- show_info "$check_root_1" # "請切換成 root 身份執行移除程式!!!"
+ show_info "$MR_check_root_1" # "請切換成 root 身份執行移除程式!!!"
exit
fi
- show_info "$check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
+ show_info "$MR_check_root_2" # "已確認為root身份, 將繼續執行此移除程式！"
}
# shutdown service
function shutdown_service () {
- show_info "$shutdown_service_echo_1" # "停止其他尚未關閉的slaves服務..."
+ show_info "$MR_shutdown_service_echo_1" # "停止其他尚未關閉的slaves服務..."
slaves_list=`cat $nutch_PATH'/nutch_nodes' | cut -d' ' -f1`
for nutch_node in $slaves_list
@@ -48,16 +48,16 @@
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 "$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 "$shutdown_service_echo_3" # "本機服務已關閉"
+ show_info "$MR_shutdown_service_echo_3" # "本機服務已關閉"
}
# 移除檔案及資料夾
function remove_folders () {
- show_info "$remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
+ show_info "$MR_remove_folders_echo_1" # "正在刪除安裝時所建立的檔案及資料夾..."
rm -rf /opt/nutchez
rm -rf /var/nutchez
- show_info "$remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
+ show_info "$MR_remove_folders_echo_2" # "安裝時所建立的檔案及資料夾已刪除"
}
@@ -65,29 +65,30 @@
# 還原/etc/hosts
function edit_hosts () {
- show_info "$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
- show_info "$edit_hosts_echo_2" # "完成修改/etc/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 "$user_delete_echo_1" # "正在刪除nutchuser使用者..."
+ show_info "$MR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
userdel -r nutchuser
- show_info "$user_delete_echo_2" # "使用者nutchuser已刪除"
+ show_info "$MR_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 "$MR_main_echo_1" #"警告 - 此一程式為移除nutchEZ程式, 若您為誤執行此一程式, 請按Ctrl+c離開此程序！"
+ show_info "$MR_main_echo_2" #"本執行程序將會移除安裝nutchEZ時所新增的檔案及nutchuser使用者帳號"
# 詢問是否繼續
- read -p "$main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
+ read -p "$MR_main_echo_3" confirm # "請問是否確定移除此一節點：1.確定 2.取消"
# 確認移除
if [ $confirm -eq 1 ]; then
@@ -97,8 +98,8 @@
edit_hosts
user_delete
- show_info "$main_echo_4" # "移除程序已完成！"
+ show_info "$MR_main_echo_4" # "移除程序已完成！"
elif [ $confirm -eq 2 ]; then
- show_info "$main_echo_5" # "您已取消移除程序！"
- show_info "$main_echo_6" # "若要移除請再重新執行！"
+ show_info "$MR_main_echo_5" # "您已取消移除程序！"
+ show_info "$MR_main_echo_6" # "若要移除請再重新執行！"
fi
}