===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -p -r1.1 -r1.4
--- OpenXM/src/asir-port/asir-install.sh	2004/02/27 00:12:22	1.1
+++ OpenXM/src/asir-port/asir-install.sh	2005/02/03 06:42:40	1.4
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenXM$
+# $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
 os=`uname -s`
@@ -11,18 +11,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-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/asirlib-$os-$libmd.tar.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/ox-texmacs-$os.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_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 +54,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 ; \
@@ -75,9 +86,14 @@ if [ ! -f $HOME/.asir-tmp/$otname ]; then
 	echo -n "Downloading the $ot plugin... " ; \
 	oxfetch.sh $ot $HOME/.asir-tmp ; \
 	echo "Done." ; \
-	(cd $HOME ; tar xzf $HOME/.asir-tmp/$otname) ; \
+	if [ -f $HOME/.TeXmacs/progs/my-init-texmacs.scm ]; then \
+		echo "Warning .TeXmacs/progs/my-init-texmacs.scm exists"; \
+		echo "Copy from ~/.asir-tmp/$otname by hand."; \
+    else (cd $HOME ; tar xzf $HOME/.asir-tmp/$otname) ; \
+    fi
 fi
 
+_check_install_error
 
 echo "Installation is completed."