=================================================================== RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v retrieving revision 1.14 retrieving revision 1.22 diff -u -p -r1.14 -r1.22 --- OpenXM/src/asir-port/asir-port.sh 2006/06/28 11:41:11 1.14 +++ OpenXM/src/asir-port/asir-port.sh 2016/06/04 23:59:01 1.22 @@ -1,12 +1,12 @@ -#!/bin/sh -# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.13 2006/02/13 04:37:36 takayama Exp $ +#!/bin/bash +# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.21 2014/07/27 02:33:19 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` +os=`dpkg --print-architecture` md=`cat $OpenXM_HOME/lib/asir/distinfo-asir.md5` libmd=`cat $OpenXM_HOME/lib/asir/distinfo-asirlib.md5` # For testing @@ -41,7 +41,11 @@ _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 @@ -61,8 +65,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 ; \ fi } @@ -89,8 +93,13 @@ 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 ) ; \ + fi ; \ + if [ -f $HOME/.feprc ]; then \ + echo "Warning .feprc exists"; \ + echo "Copy .feprc from ~/.asir-tmp/$otname by hand."; \ + else (cd $HOME ; touch .feprc.sample ; /bin/cp -n .feprc.sample .feprc) ; \ fi fi