Changeset 231

Timestamp:

Jun 28, 2010, 11:40:49 AM (14 years ago)

Author:

waue

Message:

修改client 安裝時會先載入預設語言，並檢查是否為root
master_remove.sh 則是改進 userdel 回報user nutchuser 目前登入不改刪除的錯誤

Location:

nutchez-0.2/src/shell

Files:

• client_install (modified) (3 diffs)
• client_install_func.sh (modified) (2 diffs)
• master_remove.sh (modified) (1 diff)

nutchez-0.2/src/shell/client_install

@@ -11 +11 @@
 # 需要 master_install 設定的參數區
 # Master IP here
-Master_IP_Address="input.your.master.ip_address"
+Master_IP_Address=140.110.138.192
 # Master Hostname here
-Master_Hostname="input_your_master_hostname"
+Master_Hostname=u1004
 # 此檔自己用的參數區
 Linux_Distribution="";
@@ -40 +40 @@
 source $Work_Path/client_install_func.sh;
 
+# 載入系統預設的語言
+load_default_lang
+# 檢查執行這個程式的是否為root權限
+
+check_root
+read -p "continue.."
+
 # Language Choice
 choose_lang
@@ -57 +64 @@
 
 # 檢查執行這個程式的是否為root權限
-check_root
-read -p "continue.."
+#check_root
+#read -p "continue.."
 
 # 查出此主機的作業系統,以及版本

nutchez-0.2/src/shell/client_install_func.sh

@@ -20 +20 @@
 }
 
-
-# choose Language
-function choose_lang(){
+function load_default_lang(){
 
 lang=$(locale | grep 'LANG=' | cut -d "=" -f2)
@@ -29 +27 @@
 . $Work_Path/lang/lang_en_US_client_install
 # if locale is zh then source chinese
+
 echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW_client_install
+}
+
+# choose Language
+function choose_lang(){
+
+#lang=$(locale | grep 'LANG=' | cut -d "=" -f2)
+
+# Default: source english
+#. $Work_Path/lang/lang_en_US_client_install
+# if locale is zh then source chinese
+#echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang/lang_zh_TW_client_install
 
 # Ask language

nutchez-0.2/src/shell/master_remove.sh

@@ -95 +95 @@
 function user_delete () {
   show_info "$MR_user_delete_echo_1" # "正在刪除nutchuser使用者..."
-  userdel -r nutchuser
+  userdel -rf nutchuser
   show_info "$MR_user_delete_echo_2" # "使用者nutchuser已刪除"
 }