[vlma-devel] commit: Missing argument in VLMaw command line. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu Aug 21 23:13:25 2008 +0200| [05e27f9398fafda8e5a1e11291ce543112bc86aa] | committer: Adrien Grand 

Missing argument in VLMaw command line.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=05e27f9398fafda8e5a1e11291ce543112bc86aa
---

 vlma-distribution/src/bin/vlmaw |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vlma-distribution/src/bin/vlmaw b/vlma-distribution/src/bin/vlmaw
index 1eb4dfe..cea0630 100644
--- a/vlma-distribution/src/bin/vlmaw
+++ b/vlma-distribution/src/bin/vlmaw
@@ -47,7 +47,12 @@ VLMA_OPTS="$VLMA_OPTS\
 OPTS="$VLMA_OPTS $JAVA_OPTS org.mortbay.start.Main"
 if [ "$COMMAND" = "start" ]
 then
-    exec nohup $JAVA $OPTS $VLMA_CONF/jetty.xml < /dev/null > /dev/null 2>&1 &
+    OPTS="$OPTS $VLMA_CONF/jetty.xml"
 else
-    exec $JAVA $OPTS --stop
+    if [ "$COMMAND" = "stop" ]
+    then
+        OPTS="$OPTS --stop"
+    fi
 fi
+
+exec $JAVA $OPTS