=================================================================== RCS file: /home/cvs/OpenXM/src/asir-port/asir-install.sh,v retrieving revision 1.13 retrieving revision 1.17 diff -u -p -r1.13 -r1.17 --- OpenXM/src/asir-port/asir-install.sh 2006/06/28 12:13:54 1.13 +++ OpenXM/src/asir-port/asir-install.sh 2010/07/19 09:41:53 1.17 @@ -1,5 +1,5 @@ -#!/bin/sh -# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.12 2006/06/28 11:41:11 takayama Exp $ +#!/bin/bash +# $OpenXM: OpenXM/src/asir-port/asir-install.sh,v 1.16 2009/09/13 01:18:53 takayama Exp $ # Downloading Risa/Asir for FLL-free systems # under $HOME/.asir-tmp and installs asir to $OpenXM_HOME/bin # @@ -11,7 +11,7 @@ # /root/.asir-tmp will be a work-directory in this case. # 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 @@ -47,7 +47,7 @@ _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 @@ -98,8 +98,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 ; cp -i .feprc.sample .feprc) ; \ fi fi