===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v
retrieving revision 1.7
retrieving revision 1.15
diff -u -p -r1.7 -r1.15
--- OpenXM/src/asir-port/asir-port.sh	2004/05/05 10:41:45	1.7
+++ OpenXM/src/asir-port/asir-port.sh	2006/06/28 12:13:54	1.15
@@ -1,33 +1,39 @@
 #!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.6 2004/03/04 12:08:30 takayama Exp $
+# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.14 2006/06/28 11:41:11 takayama Exp $
 # Downloading Risa/Asir for FLL-free systems.
 # Risa/Asir is installed under $HOME/.asir-tmp/$asirname
 # Symbolic link to $asirname from $OpenXM_HOME/bin/asir must exist
 # in the distribution of FLL-free distribution.
 # Starting script of Risa/Asir may call this shell script.
+version=`cat $OpenXM_HOME/lib/version.txt`
 os=`uname -s`
-md=`cat $OpenXM_HOME/lib/asir/distinfo-asir`
-libmd=`cat $OpenXM_HOME/lib/asir/distinfo-lib`
+md=`cat $OpenXM_HOME/lib/asir/distinfo-asir.md5`
+libmd=`cat $OpenXM_HOME/lib/asir/distinfo-asirlib.md5`
 # For testing
-#asir="ftp://ftp.math.kobe-u.ac.jp/pub/asir/gzip.exe"
+#asir="http://www.math.kobe-u.ac.jp/pub/asir/gzip.exe"
 #asirname="gzip.exe"
-#asirlib="ftp://ftp.math.kobe-u.ac.jp/pub/asir/tar.exe"
+#asirlib="http://www.math.kobe-u.ac.jp/pub/asir/tar.exe"
 #asirlibname="tar.exe"
 # 
-asir="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix/asir-$os-$md.gz"
-asirnamegunzip="asir-$os-$md"
-asirname="asir-$os-$md.gz"
-asirlib="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix/asirlib-$os-$libmd.tar.gz"
-asirlibname="asirlib-$os-$libmd.tar.gz"
-ot="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix/ox-texmacs-$os.tar.gz"
-otname="ox-texmacs-$os.tar.gz"
+asir="http://www.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/asir-$os-$version.gz"
+asirnamegunzip="asir-$os-$version"
+asirname="asir-$os-$version.gz"
+asirlib="http://www.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/asirlib-$os-$version.tar.gz"
+asirlibname="asirlib-$os-$version.tar.gz"
+ot="http://www.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/ox-texmacs-$os-$version.tar.gz"
+otname="ox-texmacs-$os-$version.tar.gz"
 
 if [ $# = 1 ]; then
 if [ $1 = "--install" ]; then
- rm -rf $HOME/.asir-tmp
+ rm -rf $HOME/.asir-tmp ;
+ rm -f /usr/local/OpenXM/bin/asir ;
 fi
 fi
 
+if [ -f /usr/local/OpenXM/bin/asir ]; then
+  $OpenXM_HOME/bin/fep $OpenXM_HOME/bin/asir $* ; exit ;
+fi
+
 _agree() {
 	echo "------------------------------------------------------------------"
 	echo "Risa/Asir is distributed with no warranty for non-commercial use."
@@ -40,7 +46,7 @@ _agree() {
 		return
 	fi
 	if [ $ans = "n" ]; then
-		echo "Aborting the installation." ; \
+		echo "Aborting the installation of asir." ; \
 		exit 
     fi
 	if [ $ans = "v" ]; then
@@ -55,8 +61,8 @@ _check_install_error() {
   if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
      echo "Installation of Risa/Asir from the network seems to be failed."; \
      echo "Please check if your computer is connected to the internet "; \
-     echo "  and you can download files from ftp.math.kobe-u.ac.jp  "; \
-     echo "  by passive ftp."; \
+     echo "  and you can download files from www.math.kobe-u.ac.jp  "; \
+     echo "  by http."; \
      sleep 60 ; \
   fi
 }