===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v
retrieving revision 1.2
retrieving revision 1.17
diff -u -p -r1.2 -r1.17
--- OpenXM/src/asir-port/asir-port.sh	2004/02/22 06:39:09	1.2
+++ OpenXM/src/asir-port/asir-port.sh	2009/02/24 10:21:52	1.17
@@ -1,31 +1,39 @@
-#!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.1 2004/02/21 12:57:32 takayama Exp $
+#!/bin/bash
+# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.16 2007/11/18 01:56:25 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"
+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."
@@ -38,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
@@ -49,6 +57,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 www.math.kobe-u.ac.jp  "; \
+     echo "  by http."; \
+     sleep 60 ; \
+  fi
+}
+
 if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	_agree ; \
 	echo -n "Downloading the binary of asir (1.5M) $asir ... " ; \
@@ -65,7 +83,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 .TeXmacs and .feprc from ~/.asir-tmp/$otname by hand."; \
+    else (cd $HOME ; tar xzf $HOME/.asir-tmp/$otname ; cp -i .feprc.sample .feprc) ; \
+    fi
+fi
 
+_check_install_error
 
 $OpenXM_HOME/bin/fep $OpenXM_HOME/bin/asir $*