Index: nutchez-0.2/src/test/install
===================================================================
--- nutchez-0.2/src/test/install	(revision 129)
+++ nutchez-0.2/src/test/install	(revision 130)
@@ -31,10 +31,10 @@
     format_HDFS
     start_up_NutchEZ
-    install_tomcat
+    Install_Tomcat
     start_up_tomcat
 
     # 安裝流程結束，並進入網頁管理頁面設定爬網網址...等  
     echo "Install Successfully!!"
-    echo "Visit http://$MasterIP_Address:portNO"
+    echo "Visit http://$MasterIP_Address:8080"
   elif [ $confirm -eq 2 ]; then
     main
Index: nutchez-0.2/src/test/install_func.sh
===================================================================
--- nutchez-0.2/src/test/install_func.sh	(revision 129)
+++ nutchez-0.2/src/test/install_func.sh	(revision 130)
@@ -19,14 +19,13 @@
 # /home/nutchuser/NutchEZ_source下有3個檔案
 # install.sh, nutch-1.0.tar.gz, apache-tomcat-6.0.18.tar.gz
-# 安裝路徑為/opt/nutchEZ
-
-Nutch_install_folder=/opt/nutchEZ
+# 安裝路徑為/opt/NutchEZ
+
 Install_source=/home/nutchuser/NutchEZ_source
-NutchEZ_HOME=/opt/nutchEZ
-MasterIP=`/sbin/ifconfig eth0 | grep 'inet addr' |  sed 's/^.*addr://g' | sed 's/Bcast.*$//g'`
+NutchEZ_HOME=/opt/NutchEZ
+MasterIP_Address=`/sbin/ifconfig eth0 | grep 'inet addr' |  sed 's/^.*addr://g' | sed 's/Bcast.*$//g' | sed 's/ .*// '`
 
 
 set_install_information () {
-  read -p "Please enter administrator's e-mail address:  " admin_email
+  read -p "Please enter administrator's e-mail address:  " Admin_email
   read -p "Please enter the Master DNS:  " MasterDNS
 }
@@ -42,7 +41,9 @@
 
 Install_Nutch () {
-  tar zxvf $Install_source/nutch-1.0.tar.gz /opt/
-  mv nutch-1.0 nutchEZ
-  chown -R nutchuser:nutchuser /opt/nutchEZ
+  cd /opt
+  tar zxf /opt/nutch-1.0.tar.gz
+#  tar zxvf /opt/nutch-1.0.tar.gz
+  mv /opt/nutch-1.0  NutchEZ
+  chown -R nutchuser:nutchuser $NutchEZ_HOME
   set_Nutch_conf
 }
@@ -58,16 +59,18 @@
 set_hadoop-env () {
   echo "set $NutchEZ_HOME/conf/hadoop-env.sh"
+  cd $NutchEZ_HOME/conf/
   cat >> hadoop-env.sh << EOF
 export JAVA_HOME=/usr/lib/jvm/java-6-sun
-export HADOOP_HOME=/opt/nutch
-export HADOOP_LOG_DIR=/tmp/nutch/logs
-export HADOOP_SLAVES=/opt/nutch/conf/slaves
+export HADOOP_HOME=/opt/NutchEZ
+export HADOOP_LOG_DIR=/tmp/NutchEZ/logs
+export HADOOP_SLAVES=/opt/NutchEZ/conf/slaves
 EOF
 }
 
 # set $NutchEZ_HOME/conf/hadoop-site.xml
-set_hadoop-site () {
+set_haoop-site () {
   echo "set $NutchEZ_HOME/conf/hadoop-site.xml"
-  cat > $NutchEZ_HOME/conf/hadoop-site.xml << EOF
+  cd $NutchEZ_HOME/conf/
+  cat > hadoop-site.xml << EOF
 <configuration>
 <property>
@@ -87,5 +90,6 @@
 set_nutch-site () {
   echo "set $NutchEZ_HOME/conf/nutch-site.xml"
-  cat > $NutchEZ_HOME/conf/nutch-site.xml << EOF
+  cd $NutchEZ_HOME/conf/
+  cat > nutch-site.xml << EOF
 <configuration>
 <property>
@@ -116,11 +120,24 @@
 
 set_crawl-urlfilter () {
-  echo "set NutchEZ_HOME/conf/set_crawl-urlfilter.txt"
-  Line_NO=`cat '$NutchEZ'/conf/crawl-urlfilter.txt | grep -n 'skip URLs containing certain characters as probable queries, etc.' | sed 's/:.*//g'`
-  sed -i ''$((Line_NO+1))'d' $NutchEZ/conf/crawl-urlfilter.txt
-  sed -i ''$Line_NO'a -[*!@]' $NutchEZ/conf/crawl-urlfilter.txt
-  Line_NO=`cat crawl-urlfilter.txt | grep -n 'accept hosts in MY.DOMAIN.NAME' | sed 's/:.*//g'`
-  sed -i ''$((Line_NO+1))'d' $NutchEZ/conf/crawl-urlfilter.txt
-  sed -i ''$Line_NO'a +^http://([a-z0-9]*\.)*.*/' $NutchEZ/conf/crawl-urlfilter.txt
+  echo "set $NutchEZ_HOME/conf/set_crawl-urlfilter.txt"
+  Line_NO=`cat $NutchEZ_HOME'/conf/crawl-urlfilter.txt' | grep -n 'skip file:, ftp:, & mailto: urls' | sed 's/:.*//g'`
+  sed -i ''$((Line_NO+1))'d' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+  sed -i ''$Line_NO'a -^(ftp|mailto):' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+
+
+  Line_NO=`cat $NutchEZ_HOME'/conf/crawl-urlfilter.txt' | grep -n 'skip image and other suffixes we can' | sed 's/:.*//g'`
+  sed -i ''$((Line_NO+1))'d' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+  sed -i ''$Line_NO'a -\\.(gif|GIF|jpg|JPG|png|PNG|ico|ICO|css|sit|eps|wmf|mpg|xls|gz|rpm|tgz|mov|MOV|exe|jpeg|JPEG|bmp|BMP)$' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+
+
+  Line_NO=`cat $NutchEZ_HOME'/conf/crawl-urlfilter.txt' | grep -n 'skip URLs containing certain characters as probable queries, etc.' | sed 's/:.*//g'`
+  sed -i ''$((Line_NO+1))'d' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+  sed -i ''$Line_NO'a -[*!@]' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+
+
+  Line_NO=`cat $NutchEZ_HOME'/conf/crawl-urlfilter.txt' | grep -n 'skip everything else' | sed 's/:.*//g'`
+  sed -i ''$((Line_NO+1))'d' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+  sed -i ''$Line_NO'a +.*' $NutchEZ_HOME/conf/crawl-urlfilter.txt
+  sed -i ''$Line_NO'a # accecpt anything else' $NutchEZ_HOME/conf/crawl-urlfilter.txt
 }
 
@@ -130,5 +147,4 @@
 }
 
-
 start_up_NutchEZ (){
   echo "start up NutchEZ..."
@@ -138,6 +154,10 @@
 # install tomcat
 Install_Tomcat () {
-  tar zxvf $Install_source/apache-tomcat-6.0.18.tar.gz $NutchEZ_HOME
-  mv $NutchEZ_HOME/apache-tomcat-6.0.18 $NutchEZ_HOME/tomcat
+  cd /opt/
+#  tar zxf apache-tomcat-6.0.18.tar.gz
+  tar zxf apache-tomcat-6.0.18.tar.gz
+  mv apache-tomcat-6.0.18 $NutchEZ_HOME
+  cd $NutchEZ_HOME
+  mv  apache-tomcat-6.0.18 tomcat
   chown -R nutchuser:nutchuser $NutchEZ_HOME
   mkdir $NutchEZ_HOME/web
@@ -150,14 +170,16 @@
 }
 
+
 set_server () {
   echo "$NutchEZ_HOME/tomcat/conf/server.xml"
-  Line_NO=`cat '$NutchEZ'/tomcat/conf/server.xml | grep -n '<Connector port="8080" protocol="HTTP/1.1"' | sed 's/:.*//g'`
-  sed -i ''$Line_NO','$(($Line_NO+2))'d' server.xml
-  sed -i ''$Line_NO'a <Connector port="8080" protocol="HTTP/1.1"\
+  Line_NO=`cat $NutchEZ_HOME'/tomcat/conf/server.xml' | grep -n '<!-- A "Connector" using the shared thread pool-->' | sed 's/:.*//g'`
+
+  sed -i ''$((Line_NO+1))','$((Line_NO+6))'d' $NutchEZ_HOME/tomcat/conf/server.xml
+  sed -i ''$Line_NO'a    <Connector port="8080" protocol="HTTP/1.1"\
                connectionTimeout="20000"\
-               redirectPort="8443" URIEncoding="UTF-8"/>\
-' $NutchEZ/tomcat/conf/server.xml
-}
-
+               redirectPort="8443" URIEncoding="UTF-8"\
+               useBodyEncodingForURI="true" />\
+' $NutchEZ_HOME/tomcat/conf/server.xml
+}
 
 set_nutch-site () {
@@ -165,5 +187,5 @@
   
   # 搜尋加入設定的行號位址
-  line_NO=`cat '$NutchEZ'/conf/nutch-site.xml | grep -n '<'configuration'>' | sed 's/:.*//g'`
+  line_NO=`cat $NutchEZ_HOME'/conf/nutch-site.xml' | grep -n '<'configuration'>' | sed 's/:.*//g'`
   
   # 加入設定檔
@@ -189,5 +211,5 @@
   </description>\
 </property>\
-' $NutchEZ/conf/nutch-site.xml
+' $NutchEZ_HOME/conf/nutch-site.xml
 }