===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v
retrieving revision 1.1
retrieving revision 1.16
diff -u -p -r1.1 -r1.16
--- OpenXM/src/asir-port/asir-install.sh	2004/02/27 00:12:22	1.1
+++ OpenXM/src/asir-port/asir-install.sh	2009/09/13 01:18:53	1.16
@@ -1,28 +1,38 @@
-#!/bin/sh
-# $OpenXM$
-# Downloading Risa/Asir for FLL-free systems.
-# Risa/Asir is installed under $OpenXM_HOME/bin
+#!/bin/bash
+# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.15 2009/02/24 10:21:52 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.
+#
+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"
-ot="ftp://ftp.math.kobe-u.ac.jp/pub/asir/knoppix/ox-texmacs-$os.tar.gz"
-otname="ox-texmacs-$os.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"
 
-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
@@ -37,12 +47,12 @@ _agree() {
 	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 asir license."
-	read -e -p "(y/n/v)" ans
+	read  -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
@@ -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 www.math.kobe-u.ac.jp  "; \
+     echo "  by http."; \
+     sleep 60 ; \
+     exit ; \
+  fi
+}
 
 if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	_agree ; \
@@ -61,6 +81,7 @@ if [ ! -f $HOME/.asir-tmp/$asirnamegunzip ]; then
 	echo "Done." ; \
 	gunzip $HOME/.asir-tmp/$asirname ; \
 	chmod +x $HOME/.asir-tmp/$asirnamegunzip ; \
+        rm -f $OpenXM_HOME/bin/asir ; \
 	install -m 755 $HOME/.asir-tmp/$asirnamegunzip $OpenXM_HOME/bin/asir ; \
 fi
 if [ ! -f $HOME/.asir-tmp/$asirlibname ]; then
@@ -75,9 +96,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 .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
 
 echo "Installation is completed."