===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v
retrieving revision 1.1
retrieving revision 1.12
diff -u -p -r1.1 -r1.12
--- OpenXM/src/asir-port/asir-port.sh	2004/02/21 12:57:32	1.1
+++ OpenXM/src/asir-port/asir-port.sh	2006/02/10 06:01:19	1.12
@@ -1,32 +1,52 @@
 #!/bin/sh
-# $OpenXM$
-# Downloading Risa/Asir for FLA-free systems.
+# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.11 2006/02/08 08:16:10 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 FLA-free 
+# 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`
+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"
-asirname="gzip.exe"
+#asir="ftp://ftp.math.kobe-u.ac.jp/pub/asir/gzip.exe"
+#asirname="gzip.exe"
+#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/binaries/asir-$os-$md"
-#asirname="asir-$os-$md"
+asir="ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/asir-$os-$version.gz"
+asirnamegunzip="asir-$os-$version"
+asirname="asir-$os-$version.gz"
+asirlib="ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/asirlib-$os-$version.tar.gz"
+asirlibname="asirlib-$os-$version.tar.gz"
+ot="ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/head/knoppix/ox-texmacs-$os.tar.gz"
+otname="ox-texmacs-$os.tar.gz"
 
-#echo $asir
+if [ $# = 1 ]; then
+if [ $1 = "--install" ]; then
+ 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."
-	echo "Do you agree with the license agreement at $OpenXM_HOME/Copyright/Copyright.asir?"
+	echo "OpenXM subcomponents are distributed with no warranty under BSD license or GPL."
+	echo "Do you agree with the licenses under $OpenXM_HOME/Copyright?"
 	echo "------------------------------------------------------------------"
-	echo "y: agree, n: do not agree, v: read the detail of the agreement."
+	echo "y: agree, n: do not agree, v: read the detail of the asir license."
 	read -e -p "(y/n/v)" ans
 	if [ $ans = "y" ]; then
 		return
 	fi
 	if [ $ans = "n" ]; then
-		echo "Aborting the installation." ; \
+		echo "Aborting the installation of asir." ; \
 		exit 
     fi
 	if [ $ans = "v" ]; then
@@ -37,13 +57,45 @@ _agree() {
 	_agree
 }
 
-if [ ! -f $HOME/.asir-tmp/$asirname ]; then
+_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 ; \
+	echo -n "Downloading the binary of asir (1.5M) $asir ... " ; \
 	oxfetch.sh $asir $HOME/.asir-tmp ; \
-	ln -s $HOME/.asir-tmp/$asirname $HOME/.asir-tmp/asir ; \
+	echo "Done." ; \
+	gunzip $HOME/.asir-tmp/$asirname ; \
+	chmod +x $HOME/.asir-tmp/$asirnamegunzip ; \
+	rm -f $HOME/.asir-tmp/asir ; \
+	ln -s $HOME/.asir-tmp/$asirnamegunzip $HOME/.asir-tmp/asir ; \
 fi
+if [ ! -f $HOME/.asir-tmp/$asirlibname ]; then
+	echo -n "Downloading the asir library  $asirlib... " ; \
+	oxfetch.sh $asirlib $HOME/.asir-tmp ; \
+	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
 
-#fep asir
+_check_install_error
 
+$OpenXM_HOME/bin/fep $OpenXM_HOME/bin/asir $*