Merge pull request #37 from maginatics/exit-codes

Return specific error codes where possible
diff --git a/assembly/src/main/filtered-resources/unix/bin/shell b/assembly/src/main/filtered-resources/unix/bin/shell
index cc5b4a4..64f0ed7 100644
--- a/assembly/src/main/filtered-resources/unix/bin/shell
+++ b/assembly/src/main/filtered-resources/unix/bin/shell
@@ -319,7 +319,7 @@
         CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     fi
 
-    exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Dlog4j.configuration=file://$KARAF_BASE/etc/log4j.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.jclouds.cli.runner.Main "$@"
+    exec $JAVA $JAVA_OPTS ${EXTRA_JAVA_OPTS:-} -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Dlog4j.configuration=file://$KARAF_BASE/etc/log4j.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.jclouds.cli.runner.Main "$@"
 }
 
 main() {