===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- OpenXM/src/asir-port/asir-port.sh	2004/02/24 05:43:14	1.3
+++ OpenXM/src/asir-port/asir-port.sh	2006/02/06 04:54:13	1.9
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.2 2004/02/22 06:39:09 takayama Exp $
+# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.8 2005/02/03 07:31:55 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
@@ -14,11 +14,13 @@ 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-all/knoppix-2006-02/ox-texmacs-$os.tar.gz"
+otname="ox-texmacs-$os.tar.gz"
 
 if [ $# = 1 ]; then
 if [ $1 = "--install" ]; then
@@ -49,15 +51,15 @@ _agree() {
 	_agree
 }
 
-# If there is un usb memory, then download under the usb memory.
-if [ -d /mnt/sda1/.asir-tmp ] ; then
-	rm -f $HOME/.asir-tmp ; \
-	ln -s /mnt/sda1/.asir-tmp $HOME/.asir-tmp 
-fi
-if [ -d /mnt/sdb1/.asir-tmp ] ; then
-	rm -f $HOME/.asir-tmp ; \
-	ln -s /mnt/sdb1/.asir-tmp $HOME/.asir-tmp
-fi
+_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 ; \
+  fi
+}
 
 if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	_agree ; \
@@ -75,7 +77,18 @@ if [ ! -f $HOME/.asir-tmp/$asirlibname ]; then
 	echo "Done." ; \
 	(cd $HOME/.asir-tmp ; tar xzf $asirlibname) ; \
 fi
+if [ ! -f $HOME/.asir-tmp/$otname ]; then
+	echo -n "Downloading $ot plugin... " ; \
+	oxfetch.sh $ot $HOME/.asir-tmp ; \
+	echo "Done." ; \
+	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
 
 $OpenXM_HOME/bin/fep $OpenXM_HOME/bin/asir $*