From d4270c676a3ec5233da0585f87a271e9be89bceb Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 20 Oct 2005 12:51:37 +0000
Subject: [PATCH] changes required for tiger
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@3780 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
act | 10 ++++++++--
art | 9 +++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/act b/act
index 6d8a89a1e..09e5e62a9 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 6694b2553..5976a1349 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 $*
--
GitLab