Index: mttroot/mtt/Makefile ================================================================== --- mttroot/mtt/Makefile +++ mttroot/mtt/Makefile @@ -119,28 +119,28 @@ @echo 'mtt_config_file=$(CONFDIR)/mtt.conf' >>mtt.sh.tmp @echo 'mtt_program_dir=$(PROGDIR)' >>mtt.sh.tmp @echo 'mtt_install_dir=$(INSTDIR)' >>mtt.sh.tmp @echo '' >>mtt.sh.tmp @echo '# get site-specific settings' >>mtt.sh.tmp - @echo 'if [[ -r $${mtt_config_file} ]]; then' >>mtt.sh.tmp + @echo 'if [ -r $${mtt_config_file} ]; then' >>mtt.sh.tmp @echo ' . $${mtt_config_file} $${mtt_install_dir} >/dev/null' >>mtt.sh.tmp @echo '' >>mtt.sh.tmp - @echo 'elif [[ -r $${mtt_install_dir}/bin/mttrc ]]; then' >>mtt.sh.tmp + @echo 'elif [ -r $${mtt_install_dir}/bin/mttrc ]; then' >>mtt.sh.tmp @echo ' . $${mtt_install_dir}/bin/mttrc $${mtt_install_dir}' >>mtt.sh.tmp @echo 'fi' >>mtt.sh.tmp @echo '' >>mtt.sh.tmp @echo '# get user-specific settings' >>mtt.sh.tmp - @echo 'if [[ -r $${HOME}/.mttrc ]]; then' >>mtt.sh.tmp + @echo 'if [ -r $${HOME}/.mttrc ]; then' >>mtt.sh.tmp @echo ' . $${HOME}/.mttrc' >>mtt.sh.tmp @echo 'fi' >>mtt.sh.tmp @echo '' >>mtt.sh.tmp @echo '# get directory-specific settings' >>mtt.sh.tmp - @echo 'if [[ -r ./.mttrc ]]; then' >>mtt.sh.tmp + @echo 'if [ -r ./.mttrc ]; then' >>mtt.sh.tmp @echo ' . ./.mttrc' >>mtt.sh.tmp @echo 'fi' >>mtt.sh.tmp @echo '' >>mtt.sh.tmp mtt.sh: mtt.sh.tmp @cat mtt.sh.tmp bin/mtt > mtt.sh xmtt.sh: mtt.sh.tmp @cat mtt.sh.tmp bin/xmtt > xmtt.sh Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -15,10 +15,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.406 2005/01/06 15:36:06 geraint +## Tidied output of options. +## ## Revision 1.405 2005/01/06 12:47:53 geraint ## Fixed generation of sese.r with -make-sort option. ## ## Revision 1.404 2004/09/10 21:05:15 geraint ## Ensure that the system exists before proceeding. @@ -2315,11 +2318,11 @@ done done fi # Tidy mode - operate in the directory MTT-work -if [[ "$tidy" = "tidy" && "$level" = "0" ]]; then +if [ "$tidy" = "tidy" ] && [ "$level" = "0" ]; then # make sure that a system exists in this directory if [ "${sys}_${rep}.${lang}" != "${sys}_abg.dia" ] && [ "${sys}_${rep}.${lang}" != "${sys}_abg.fig" ]; then nabgs=`ls ${sys}_abg.* 2>/dev/null | wc -l` if [ $nabgs -eq 0 ]; then echo "MTT Error: System $sys does not exist" Index: mttroot/mtt/bin/mtt_versions ================================================================== --- mttroot/mtt/bin/mtt_versions +++ mttroot/mtt/bin/mtt_versions @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.4 2003/08/06 22:39:40 geraint +## Fixed reporting of non-existent software, no longer says "is OK and has version .". +## ## Revision 1.3 2002/04/28 18:41:26 geraint ## Fixed [ 549658 ] awk should be gawk. ## Replaced calls to awk with call to gawk. ## ## Revision 1.2 2000/11/13 21:40:26 peterg @@ -52,11 +55,11 @@ print_version () { program=${1:-"Error: unknown program"} shift; version=$* - if [[ ${version:-""} ]]; then + if [ ${version:-""} ]; then echo is OK and has version $version. else echo $program does not exist. fi } Index: mttroot/mtt/bin/trans/mtt_uncompress.sh ================================================================== --- mttroot/mtt/bin/trans/mtt_uncompress.sh +++ mttroot/mtt/bin/trans/mtt_uncompress.sh @@ -2,11 +2,11 @@ file=$1 gzip --test --quiet $file 2> /dev/null ; file_is_uncompressed=$? -if [[ $file_is_uncompressed -eq 0 ]]; then +if [ $file_is_uncompressed -eq 0 ]; then gz=`mktemp $file.gz.tmpXXXXXX` mv $file $gz zcat $gz > $file fi