===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v
retrieving revision 1.3
retrieving revision 1.19
diff -u -p -r1.3 -r1.19
--- OpenXM/src/asir-port/asir-install.sh	2004/05/05 10:41:45	1.3
+++ OpenXM/src/asir-port/asir-install.sh	2016/06/04 23:59:01	1.19
@@ -1,23 +1,32 @@
-#!/bin/sh
-# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.2 2004/03/02 09:51:45 takayama Exp $
-# Downloading Risa/Asir for FLL-free systems.
-# Risa/Asir is installed under $OpenXM_HOME/bin
-os=`uname -s`
-md=`cat $OpenXM_HOME/lib/asir/distinfo-asir`
-libmd=`cat $OpenXM_HOME/lib/asir/distinfo-lib`
+#!/bin/bash
+# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.18 2013/02/15 05:06:21 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=`dpkg --print-architecture`
+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 \
                fff gr ifplot katsura mat nf num primdec \
@@ -38,12 +47,16 @@ _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
+    if [ -f "/tmp/i-agree-with-asir-license" ]; then
+      ans="y" 
+    else
+  	 read  -p "(y/n/v)" ans
+    fi
 	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
@@ -58,8 +71,8 @@ _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."; \
+     echo "  and you can download files from www.math.kobe-u.ac.jp  "; \
+     echo "  by http."; \
      sleep 60 ; \
      exit ; \
   fi
@@ -72,6 +85,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
@@ -88,8 +102,8 @@ if [ ! -f $HOME/.asir-tmp/$otname ]; then
 	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) ; \
+		echo "Copy .TeXmacs and .feprc from ~/.asir-tmp/$otname by hand."; \
+    else (cd $HOME ; tar xzf $HOME/.asir-tmp/$otname ; /bin/cp -n .feprc.sample .feprc) ; \
     fi
 fi