Changeset 194

Timestamp:

Jun 15, 2010, 4:10:36 PM (14 years ago)

Author:

rock

Message:

新增 Work_Path

Location:

nutchez-0.2/src/test

Files:

• client_install (modified) (2 diffs)
• client_install_func.sh (modified) (2 diffs)
• nutchez (modified) (3 diffs)

nutchez-0.2/src/test/client_install

@@ -9 +9 @@
 # 正式版之後，記的將不必要 read 拿掉 (trace 用的 read)
 
-# 設定 functions 
-. ./client_install_func.sh
-
 # 需要 master_install 設定的參數區
 # Master IP here
@@ -21 +18 @@
 Linux_Version="";
 Nutchuser_Passwd="xxxxxxxxxx";
+Work_Path=$(echo $0 | sed 's/client_install//')
+
+# Source functions
+source $Work_Path/client_install_func.sh
 
 # Language Choice

nutchez-0.2/src/test/client_install_func.sh

@@ -27 +27 @@
 
 # Default: source english
-. lang_en_US_client_install
+. $Work_Path/lang_en_US_client_install
 # if locale is zh then source chinese
-echo $lang | grep 'zh' >> /dev/null && source lang_zh_TW_client_install
+echo $lang | grep 'zh' >> /dev/null && source $Work_Path/lang_zh_TW_client_install
 
 # Ask language
@@ -36 +36 @@
 
 if [ $langChoice == "2" ]; then
-    source lang_zh_TW_client_install
+    source $Work_Path/lang_zh_TW_client_install
 else
-    source lang_en_US_client_install
+    source $Work_Path/lang_en_US_client_install
 fi
 }

nutchez-0.2/src/test/nutchez

@@ -18 +18 @@
 Tomcat_HOME="/opt/nutchez/tomcat"
 NutchEZ_HOME="/home/nutchuser/nutchez"
+Work_Path=$(echo $0 | sed 's/client_install//')
 
 # [Env Declaration] #
-. lang_en_US_nutchez
+. $Work_Path/lang_en_US_nutchez
 
 # [Functions Declaration] #
@@ -28 +29 @@
 
 # if lang=zh then source lang_zh_TW_nutchez
-echo $lang | grep 'zh' && source lang_zh_TW_nutchez
+echo $lang | grep 'zh' && source $Work_Path/lang_zh_TW_nutchez
 }
 
@@ -332 +333 @@
     exit
 elif [ "$(cat $langSwitch)" == "en_US" ]; then
-    source lang_en_US_nutchez
+    source $Work_Path/lang_en_US_nutchez
     main_menu
     menu_choose
 elif [ "$(cat $langSwitch)" == "zh_TW" ]; then
-    source lang_zh_TW_nutchez
+    source $Work_Path/lang_zh_TW_nutchez
     main_menu
     menu_choose