Changeset 132

Timestamp:

May 28, 2010, 10:08:30 AM (15 years ago)

Author:

rock

Message:

修改部份功能，測試正常(於 Ubuntu 10.04 的桌機上測試)

Location:

nutchez-0.2/src/test

Files:

• client_install (moved) (moved from nutchez-0.2/src/test/client_install.sh) (3 diffs)
• client_install_func.sh (modified) (3 diffs)

nutchez-0.2/src/test/client_install

@@ -12 +12 @@
 . ./client_install_func.sh
 
-# 需要master_install 設定的參數區
+# 需要 master_install 設定的參數區
 Master_IP_Address="a.a.a.a";
 
@@ -21 +21 @@
 
 # 參數詢問
-yesno="no"    
+yesno="no"
 echo -e "\nYour master IP: $Master_IP_Address"
 echo -e "Your Nutchuser Password: $Nutchuser_Passwd"
 read -p "These data are cooect? (yes/no): " yesno
               
-if [ "$yesno" == "no" ];then
-    echo "Plz edit these parameters of this file."
-    exit      
-    else      
-#    echo "yes"                                                                                   
+if [ "$yesno" == "yes" ] || [ "$yesno" == "y" ] ; then
+    echo "These parameters are correct."
+else
+    echo "Plz edit these parameters in this file."
+    exit
 fi
 
@@ -44 +44 @@
 # 查出此主機的作業系統,以及版本
 check_systemInfo
+read
+
+# 安裝需要的套件 (目前只支援 deb 套件的系統自動安裝，yum或其他套件系統的則必須手動安裝)
+# 需要套件名稱 ssh, expect, dialog 
+install_packages
 read
 

nutchez-0.2/src/test/client_install_func.sh

@@ -27 +27 @@
 echo -e "\n= check_systemInfo (debug) ="
 echo -e "\nYour system information are:"
-lsb_release -a 2>/dev/null 
+distribution=$(lsb_release -d 2>/dev/null)
+Linux_Distribution=$(echo $distribution | awk '{print $2}')
+Linux_Version=$(echo $distribution | awk '{print $3}')
+echo $Linux_Distribution , $Linux_Version
+unset distribution
+}
+
+
+# 安裝需要的相依套件 (目前只支援 deb 套件的系統自動安裝，yum或其他套件系統的則需手動安裝)
+function install_packages(){
+# deb 系列系統
+if [ "$Linux_Distribution" == "Ubuntu" ] || [ "$Linux_Distribution" == "Debian" ] ;then
+    aptitude install -y expect ssh dialog
+# rpm 系列系統
+elif [ "$Linux_Distribution" == "Fedora" ] || [ "$Linux_Distribution" == "CentOS" ] ;then
+    echo -e "Plz install expect, ssh, and dialog."
+fi 
 }
 
@@ -35 +51 @@
 function check_nez_installed(){
 echo -e "\n= chcheck_nez_installed (debug) ="
-test -d /opt/nutchez && echo -e "\nYour system already had NutchEz." || \
-echo -e "\nYour system does not has NutchEz."
+if [ -d /opt/nutchez ]; then
+    echo -e "\nSystem already had NutchEz."
+    exit
+else
+    echo -e "\nSystem does not has NutchEz."
+fi
 }
 
@@ -177 +197 @@
     expect eof"
 else
-    echo "System already has nutchuser, create nutchuser and change password."
+    echo "Create nutchuser and change password."
     useradd -m nutchuser -s /bin/bash
     expect -c "spawn passwd nutchuser