=================================================================== RCS file: /home/cvs/OpenXM/src/asir-port/asir-port.sh,v retrieving revision 1.4 retrieving revision 1.7 diff -u -p -r1.4 -r1.7 --- OpenXM/src/asir-port/asir-port.sh 2004/02/27 00:12:22 1.4 +++ OpenXM/src/asir-port/asir-port.sh 2004/05/05 10:41:45 1.7 @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.3 2004/02/24 05:43:14 takayama Exp $ +# $OpenXM: OpenXM/src/asir-port/asir-port.sh,v 1.6 2004/03/04 12:08:30 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 @@ -51,15 +51,15 @@ _agree() { _agree } -# If there is un usb memory, then download under the usb memory. -if [ -d /mnt/sda1/.asir-tmp ] ; then - rm -f $HOME/.asir-tmp ; \ - ln -s /mnt/sda1/.asir-tmp $HOME/.asir-tmp -fi -if [ -d /mnt/sdb1/.asir-tmp ] ; then - rm -f $HOME/.asir-tmp ; \ - ln -s /mnt/sdb1/.asir-tmp $HOME/.asir-tmp -fi +_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 ; \ @@ -81,9 +81,14 @@ if [ ! -f $HOME/.asir-tmp/$otname ]; then echo -n "Downloading $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 from ~/.asir-tmp/$otname by hand."; \ + else (cd $HOME ; tar xzf $HOME/.asir-tmp/$otname) ; \ + fi fi +_check_install_error $OpenXM_HOME/bin/fep $OpenXM_HOME/bin/asir $*