[72141] trunk/dports/devel/sbt

[ryandesign at macports.org]

Revision: 72141
          http://trac.macports.org/changeset/72141
Author:   ryandesign at macports.org
Date:     2010-10-04 18:33:06 -0700 (Mon, 04 Oct 2010)
Log Message:
-----------
sbt: fix quoting of arguments in wrapper script, and avoid an extract error; see #26725

Modified Paths:
--------------
    trunk/dports/devel/sbt/Portfile
    trunk/dports/devel/sbt/files/sbt.sh

Modified: trunk/dports/devel/sbt/Portfile
===================================================================
--- trunk/dports/devel/sbt/Portfile	2010-10-05 01:21:00 UTC (rev 72140)
+++ trunk/dports/devel/sbt/Portfile	2010-10-05 01:33:06 UTC (rev 72141)
@@ -5,6 +5,7 @@
 
 name                sbt
 version             0.7.4
+revision            1
 categories          devel java
 maintainers         jon.buffington.name:me
 platforms           darwin
@@ -32,6 +33,7 @@
 
 extract.suffix      .jar
 extract.mkdir       yes
+extract.only
 pre-extract {
     file copy ${filespath}/${wrapper} ${worksrcpath}
 }

Modified: trunk/dports/devel/sbt/files/sbt.sh
===================================================================
--- trunk/dports/devel/sbt/files/sbt.sh	2010-10-05 01:21:00 UTC (rev 72140)
+++ trunk/dports/devel/sbt/files/sbt.sh	2010-10-05 01:33:06 UTC (rev 72141)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2007-2009 Jon Buffington. All rights reserved.
+# Copyright (c) 2010 Jon Buffington. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +17,10 @@
 # Is the location of the SBT launcher JAR file.
 LAUNCHJAR="__SBT_LAUNCHER_PATH__"
 
-# Capture any arguments
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-	QUOTED_ARGS="$QUOTED_ARGS \"$1\""
-	shift
-done
-
 # Ensure enough heap space is created for SBT.
 if [ -z "$JAVA_OPTS" ]; then
 	JAVA_OPTS="-Xmx512M"
 fi
 
 # Assume java is already in the shell path.
-exec java $JAVA_OPTS -jar "$LAUNCHJAR" $QUOTED_ARGS
+exec java $JAVA_OPTS -jar "$LAUNCHJAR" "$@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101004/235d5307/attachment-0001.html>