airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AIRAVATA-1047
Date Mon, 10 Mar 2014 12:30:15 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 74a5d2a56 -> de76d8941


https://issues.apache.org/jira/browse/AIRAVATA-1047


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/de76d894
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/de76d894
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/de76d894

Branch: refs/heads/master
Commit: de76d89415ffd6f8eb0067b8262b144c975a7ebc
Parents: 74a5d2a
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Mon Mar 10 08:29:53 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Mon Mar 10 08:29:53 2014 -0400

----------------------------------------------------------------------
 .../src/main/resources/bin/airavata-server.sh   | 24 +++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/de76d894/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.sh
b/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.sh
index 37026ee..715da4e 100755
--- a/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.sh
+++ b/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.sh
@@ -20,14 +20,11 @@
 . `dirname $0`/setenv.sh
 cd $AIRAVATA_HOME/bin
 LOGO_FILE="logo.txt"
-if [ -e $LOGO_FILE ]
-then
-	cat $LOGO_FILE
-fi
 
 JAVA_OPTS=""
 AIRAVATA_COMMAND=""
 IS_DAEMON_MODE=false
+LOGO=true
 for var in "$@"
 do
     case $var in
@@ -43,12 +40,22 @@ do
 	    IS_DAEMON_MODE=true
             shift
         ;;
+	stop)
+	    LOGO=false
+	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
+            shift
+        ;;
+	-nologo)
+	    LOGO=false
+            shift
+        ;;
         -h)
             echo "Usage: airavata-server.sh [command-options]"
             echo "command options:"
 	    echo "  start                   Start server in daemon mode"
 	    echo "  stop [--serverIndex n]  Stop all airavata servers. Specify serverIndex stop
a particular instance"
 	    echo "  --<key>=<value>         Server setting(s) to override or introduce
(overrides values in airavata-server.properties)"
+            echo "  -nologo                 Do not show airavata logo"
             echo "  -xdebug                 Start Airavata Server under JPDA debugger"
             echo "  -security               Enable Java 2 security"
             echo "  -h                      Display this help and exit"
@@ -60,9 +67,14 @@ do
             shift
     esac
 done
-
+if $LOGO ; then
+	if [ -e $LOGO_FILE ]
+	then
+		cat $LOGO_FILE
+	fi
+fi
 if $IS_DAEMON_MODE ; then
-	echo ,"Starting airavata server in daemon mode..."
+	echo "Starting airavata server in daemon mode..."
 	nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
 	    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
 	    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > airavata-server.out
& 


Mime
View raw message