===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v
retrieving revision 1.4
retrieving revision 1.12
diff -u -p -r1.4 -r1.12
--- OpenXM/src/asir-port/asir-install.sh	2005/02/03 06:42:40	1.4
+++ OpenXM/src/asir-port/asir-install.sh	2006/06/28 11:41:11	1.12
@@ -1,23 +1,32 @@
 #!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.3 2004/05/05 10:41:45 takayama Exp $
-# Downloading Risa/Asir for FLL-free systems.
-# Risa/Asir is installed under $OpenXM_HOME/bin
+# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.11 2006/02/13 04:37:36 takayama Exp $
+# Downloading Risa/Asir for FLL-free systems
+# under $HOME/.asir-tmp and installs asir to $OpenXM_HOME/bin
+#
+# In the Debian package, /usr/local/OpenXM/bin/asir is the symbolic link to
+# /home/knoppix/.asir-tmp/asir.
+# So, on non-knoppix system, execute
+# (export OpenXM_HOME=/usr/local/OpenXM; openxm asir-install.sh)
+# as the root in the bash to install the asir under /usr/local/OpenXM/bin.
+#  /root/.asir-tmp will be a work-directory in this case.
+#
+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-all/knoppix-2005-02/asir-$os-$md.gz"
-asirnamegunzip="asir-$os-$md"
-asirname="asir-$os-$md.gz"
-asirlib="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix-all/knoppix-2005-02/asirlib-$os-$libmd.tar.gz"
-asirlibname="asirlib-$os-$libmd.tar.gz"
-ot="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix-all/knoppix-2005-02/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"
 
 ASIR_LIB_FILES="alph bfct bgk const cyclic defs.h dmul fctrdata fctrtest \
                fff gr ifplot katsura mat nf num primdec \
@@ -43,7 +52,7 @@ _agree() {
 		return
 	fi
 	if [ $ans = "n" ]; then
-		echo "Aborting the installation." ; \
+		echo "Aborting the installation of asir." ; \
 		exit 
     fi
 	if [ $ans = "v" ]; then
@@ -72,6 +81,7 @@ if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	echo "Done." ; \
 	gunzip $HOME/.asir-tmp/$asirname ; \
 	chmod +x $HOME/.asir-tmp/$asirnamegunzip ; \
+        rm -f $OpenXM_HOME/bin/asir ; \
 	install -m 755 $HOME/.asir-tmp/$asirnamegunzip $OpenXM_HOME/bin/asir ; \
 fi
 if [ ! -f $HOME/.asir-tmp/$asirlibname ]; then