===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/asir-port/asir-install.sh	2004/03/02 09:51:45	1.2
+++ OpenXM/src/asir-port/asir-install.sh	2006/02/06 04:54:13	1.7
@@ -1,7 +1,16 @@
 #!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.1 2004/02/27 00:12:22 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.6 2005/04/20 22:24:39 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.
+#
+echo $HOME
 os=`uname -s`
 md=`cat $OpenXM_HOME/lib/asir/distinfo-asir`
 libmd=`cat $OpenXM_HOME/lib/asir/distinfo-lib`
@@ -11,18 +20,19 @@ libmd=`cat $OpenXM_HOME/lib/asir/distinfo-lib`
 #asirlib="ftp://ftp.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"
+asir="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix-all/knoppix-2006-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/asirlib-$os-$libmd.tar.gz"
+asirlib="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix-all/knoppix-2006-02/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"
+ot="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix-all/knoppix-2006-02/ox-texmacs-$os.tar.gz"
 otname="ox-texmacs-$os.tar.gz"
 
-ASIR_LIB_FILES=alph bfct bgk const cyclic defs.h dmul fctrdata fctrtest \
+ASIR_LIB_FILES="alph bfct bgk const cyclic defs.h dmul fctrdata fctrtest \
                fff gr ifplot katsura mat nf num primdec \
-               ratint robot solve sp sturm xm
+               ratint robot solve sp sturm xm"
 
+
 if [ $# = 1 ]; then
 if [ $1 = "--force" ]; then
  rm -rf $HOME/.asir-tmp
@@ -53,6 +63,16 @@ _agree() {
 	_agree
 }
 
+_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."; \
+     sleep 60 ; \
+     exit ; \
+  fi
+}
 
 if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	_agree ; \
@@ -82,6 +102,7 @@ if [ ! -f $HOME/.asir-tmp/$otname ]; then
     fi
 fi
 
+_check_install_error
 
 echo "Installation is completed."