diff options
author | Makarius Wenzel <makarius@sketis.net> | 2000-09-21 17:19:57 +0000 |
---|---|---|
committer | Makarius Wenzel <makarius@sketis.net> | 2000-09-21 17:19:57 +0000 |
commit | d6abc6c1edc639ce9ea54b316290b2f3f43a5a41 (patch) | |
tree | 8c71f9282728305747fbcfcc69bfea72ebe1a182 | |
parent | 95e1345882e3631d08162b22a6241ea46dc79ead (diff) |
use plain /bin/sh instead of bash;
-rw-r--r-- | isa/interface | 28 | ||||
-rw-r--r-- | isar/interface | 28 |
2 files changed, 32 insertions, 24 deletions
diff --git a/isa/interface b/isa/interface index f41dbdea..3c7c4282 100644 --- a/isa/interface +++ b/isa/interface @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # $Id$ # @@ -6,8 +6,9 @@ ## self references -KIND=$(basename $(dirname "$0")) -export PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo "$PWD") +THIS=`cd \`dirname "$0"\`; pwd` +SUPER=`cd "$THIS/.."; pwd` +KIND=`basename \`dirname "$0"\`` if [ "$KIND" = isar ]; then ISAR=true @@ -18,7 +19,7 @@ fi ## diagnostics -function usage() +usage() { echo echo "Usage: Isabelle [OPTIONS] [FILES ...]" @@ -40,7 +41,7 @@ function usage() exit 1 } -function fail() +fail() { echo "$1" >&2 exit 2 @@ -58,7 +59,7 @@ WINDOWSYSTEM="true" XSYMBOL="" XSYMBOLSETUP=true -function getoptions() +getoptions() { OPTIND=1 while getopts "I:X:l:p:u:w:x:" OPT @@ -94,8 +95,8 @@ function getoptions() getoptions $PROOFGENERAL_OPTIONS -getoptions "$@" -shift $(($OPTIND - 1)) +getoptions $* +shift `expr $OPTIND - 1` if [ "$ISAR" = true ]; then KIND=isar @@ -131,7 +132,7 @@ fi [ ! "$XSYMBOLSETUP" = true ] && XSYMBOL_HOME="" -ARGS="$ARGS -l $PROOFGENERAL_HOME/isa/interface-setup.el" +ARGS="$ARGS -l $SUPER/isa/interface-setup.el" for FILE in "$ISABELLE_HOME/etc/proofgeneral-settings.el" \ "$ISABELLE_HOME_USER/etc/proofgeneral-settings.el" @@ -139,8 +140,11 @@ do [ -f "$FILE" ] && ARGS="$ARGS -l $FILE" done -export PROOFGENERAL_ASSISTANTS="$KIND" -export PROOFGENERAL_LOGIC="$LOGIC" -export PROOFGENERAL_XSYMBOL="$XSYMBOL" +PROOFGENERAL_HOME="$SUPER" +PROOFGENERAL_ASSISTANTS="$KIND" +PROOFGENERAL_LOGIC="$LOGIC" +PROOFGENERAL_XSYMBOL="$XSYMBOL" + +export PROOFGENERAL_HOME PROOFGENERAL_ASSISTANTS PROOFGENERAL_LOGIC PROOFGENERAL_XSYMBOL exec $PROGNAME $ARGS $FILES diff --git a/isar/interface b/isar/interface index f41dbdea..3c7c4282 100644 --- a/isar/interface +++ b/isar/interface @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # $Id$ # @@ -6,8 +6,9 @@ ## self references -KIND=$(basename $(dirname "$0")) -export PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo "$PWD") +THIS=`cd \`dirname "$0"\`; pwd` +SUPER=`cd "$THIS/.."; pwd` +KIND=`basename \`dirname "$0"\`` if [ "$KIND" = isar ]; then ISAR=true @@ -18,7 +19,7 @@ fi ## diagnostics -function usage() +usage() { echo echo "Usage: Isabelle [OPTIONS] [FILES ...]" @@ -40,7 +41,7 @@ function usage() exit 1 } -function fail() +fail() { echo "$1" >&2 exit 2 @@ -58,7 +59,7 @@ WINDOWSYSTEM="true" XSYMBOL="" XSYMBOLSETUP=true -function getoptions() +getoptions() { OPTIND=1 while getopts "I:X:l:p:u:w:x:" OPT @@ -94,8 +95,8 @@ function getoptions() getoptions $PROOFGENERAL_OPTIONS -getoptions "$@" -shift $(($OPTIND - 1)) +getoptions $* +shift `expr $OPTIND - 1` if [ "$ISAR" = true ]; then KIND=isar @@ -131,7 +132,7 @@ fi [ ! "$XSYMBOLSETUP" = true ] && XSYMBOL_HOME="" -ARGS="$ARGS -l $PROOFGENERAL_HOME/isa/interface-setup.el" +ARGS="$ARGS -l $SUPER/isa/interface-setup.el" for FILE in "$ISABELLE_HOME/etc/proofgeneral-settings.el" \ "$ISABELLE_HOME_USER/etc/proofgeneral-settings.el" @@ -139,8 +140,11 @@ do [ -f "$FILE" ] && ARGS="$ARGS -l $FILE" done -export PROOFGENERAL_ASSISTANTS="$KIND" -export PROOFGENERAL_LOGIC="$LOGIC" -export PROOFGENERAL_XSYMBOL="$XSYMBOL" +PROOFGENERAL_HOME="$SUPER" +PROOFGENERAL_ASSISTANTS="$KIND" +PROOFGENERAL_LOGIC="$LOGIC" +PROOFGENERAL_XSYMBOL="$XSYMBOL" + +export PROOFGENERAL_HOME PROOFGENERAL_ASSISTANTS PROOFGENERAL_LOGIC PROOFGENERAL_XSYMBOL exec $PROGNAME $ARGS $FILES |