diff --git a/act b/act index 6d8a89a1eecab9ab63a20dc434afda36a79fd7a5..09e5e62a9f10e3dadeb3d329c7b16d7e0c4f8855 100755 --- a/act +++ b/act @@ -7,7 +7,7 @@ # /usr/local/bin/ or elsewhere. -# $Header: //tmp/pathsoft/artemis/act,v 1.7 2005-08-25 10:55:38 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/act,v 1.8 2005-10-20 12:51:37 tjc Exp $ # resolve links - $0 may be a link PRG=$0 @@ -96,11 +96,17 @@ else JAVA=$JAVA_VM fi +PLATTMP=`uname` +if [ "$PLATTMP" = "Darwin" ] +then + FLAGS="$FLAGS -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=ACT" +fi + if [ $QUIET = no ] then echo starting ACT with flags: $FLAGS 1>&2 fi -$JAVA -Dcom.apple.mrj.application.apple.menu.about.name="ACT" $FLAGS $ACT_PROPERTIES uk.ac.sanger.artemis.components.ActMain $* +$JAVA $FLAGS $ACT_PROPERTIES uk.ac.sanger.artemis.components.ActMain $* diff --git a/art b/art index 6694b255399ab629a570a6049b5cf0965850789c..5976a1349db6011436eae8922ddb314eb0b1004d 100755 --- a/art +++ b/art @@ -6,7 +6,7 @@ # necessary a symbolic link can be made to this script from # /usr/local/bin/ or elsewhere. -# $Header: //tmp/pathsoft/artemis/art,v 1.12 2005-09-07 13:35:24 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/art,v 1.13 2005-10-20 12:49:29 tjc Exp $ # resolve links - $0 may be a link PRG=$0 @@ -112,10 +112,15 @@ else JAVA=$JAVA_VM fi +PLATTMP=`uname` +if [ "$PLATTMP" = "Darwin" ] +then + FLAGS="$FLAGS -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=Artemis" +fi if [ "$QUIET" = no ] then echo starting Artemis with flags: $FLAGS $ARTEMIS_PROPERTIES 1>&2 fi -$JAVA -Dj2ssh -Dcom.apple.mrj.application.apple.menu.about.name="Artemis" -Djdbc.drivers=org.postgresql.Driver $FLAGS $ARTEMIS_PROPERTIES uk.ac.sanger.artemis.components.ArtemisMain $* +$JAVA -Dj2ssh -Djdbc.drivers=org.postgresql.Driver $FLAGS $ARTEMIS_PROPERTIES uk.ac.sanger.artemis.components.ArtemisMain $*