Changeset 129 for nutchez-0.2

Timestamp:

May 25, 2010, 3:32:41 PM (14 years ago)

Author:

rock

Message:

先增參數(Master_IP_Address, Nutchuser_Passwd)確認
修改2函式(creat_nutchuser_account, scp_master_nutchuser_sshkey)的錯誤偵測

Location:

nutchez-0.2/src/test

Files:

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

nutchez-0.2/src/test/client_install.sh

@@ -19 +19 @@
 Linux_Version="";
 Nutchuser_Passwd="xxxxxxxx";
+
+# 參數詢問
+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"                                                                                   
+fi
 
 # 功能邏輯區

nutchez-0.2/src/test/client_install_func.sh

@@ -128 +128 @@
 echo -e "mkdir -p /home/nutchuser/"
 mkdir -p /home/nutchuser/
-read -p "Plz input nutchuser passwd of mater node: " Nutchuser_Passwd
-
-echo -e "scp nutchuser@$1:~/.ssh /home/nutchuser/"
-expect -c "spawn scp -r -o StrictHostKeyChecking=no nutchuser@$1:~/.ssh /home/nutchuser/
-expect \"*: \"
-send \"$Nutchuser_Passwd\r\"
-expect eof"
-
-chown -R nutchuser:nutchuser /home/nutchuser/.ssh
+
+while [ ! -d "/home/nutchuser/.ssh" ]
+    do
+    echo -e "\n"
+    read -p "Plz input nutchuser passwd of master node: " Nutchuser_Passwd
+    echo -e "scp nutchuser@$1:~/.ssh /home/nutchuser/"
+    expect -c "spawn scp -r -o StrictHostKeyChecking=no nutchuser@$1:~/.ssh /home/nutchuser/
+    expect \"*: \" { send \"$Nutchuser_Passwd\r\" }
+    expect \"*: \" { send_user \"Passwd is error\" }
+    expect eof"
+        if [ ! -d "/home/nutchuser/.ssh" ]; then
+            echo -e "\nPasswd is error, plz re-input nutchuser passwd of master node."
+        else
+            echo -e "\nscp correct."
+        fi
+        echo "chown -R nutchuser:nutchuser /home/nutchuser/.ssh"
+        chown -R nutchuser:nutchuser /home/nutchuser/.ssh
+done
 }
 
@@ -143 +152 @@
 function creat_nutchuser_account(){
 echo -e "\n= creat_nutchuser_account (debug) ="                             
-read -p "Create nutchuser, plz input nutchuser's password: " Nutchuser_Passwd
-useradd -m nutchuser -s /bin/bash
-
-expect -c "spawn passwd nutchuser                 
-expect \"*: \" 
-send \"$1\r\"
-expect \"*: \" 
-send \"$1\r\" 
-expect eof"
+
+# 若沒 nutchuser_Passwd 的參數傳遞才將註解打開讓使用者字型輸入
+#while [ "1" != "$Nutchuser_Passwd2" ]
+#do
+#    read -p "Create nutchuser, plz input nutchuser's password: " Nutchuser_Passwd
+#    read -p "plz input nutchuser's password, again: " Nutchuser_Passwd2
+
+#    if [ "$1" == "$Nutchuser_Passwd2" ]; then
+#        echo "Two Passwords match."
+#    else
+#        echo "two passwords do not match, plz re-input nutchuser's password."
+#    fi
+#done
+
+#unset Nutchuser_Passwd2
+
+if [ $(cat /etc/passwd | grep nutchuser) ]; then
+    echo "System already has nutchuser, change nutchuser password."
+    expect -c "spawn passwd nutchuser                 
+    expect \"*: \"                         
+    send \"$1\r\"                          
+    expect \"*: \"                         
+    send \"$1\r\"                          
+    expect eof"
+else
+    echo "System already has nutchuser, create nutchuser and change password."
+    useradd -m nutchuser -s /bin/bash
+    expect -c "spawn passwd nutchuser                 
+    expect \"*: \" 
+    send \"$1\r\"
+    expect \"*: \" 
+    send \"$1\r\" 
+    expect eof"
+fi
 }