Plumb JARRG_JAVA_OPTS through

[jarrg-ian.git] / jarrg

diff --git a/jarrg b/jarrg
index d5db77c544ddd5e00c54868521aa15f698eadfbc..14c8fd99ba857e9ed389aedb21351963d1138999 100755 (executable)
--- a/jarrg
+++ b/jarrg
@@ -170,7 +170,8 @@ if $check_only; then echo "Check successful."; exit 0; fi
 
 set +e
 $setup_only_simulate "$realjava" \
- -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
+ -Dnet.chiark.yarrg.controlpanel.exitstatus=12 \
+ $JARRG_JAVA_OPTS \
  -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e
@@ -216,7 +217,8 @@ cat <<'END' >"$wrapper"
 #exec 4>&-
 
        yppclass=com.threerings.yohoho.client.YoApp
-       atclass=com.tedpearson.ypp.market.MarketUploader
+       atclass=net.chiark.yarrg.MarketUploader
+       # for testing atclass=net.chiark.yarrg.MarketUploader,Monkey
 
        args=( "$@" )
        nargs=${#args[*]}
@@ -231,12 +233,13 @@ cat <<'END' >"$wrapper"
                set     -e$JARRG_JWRAP_X -- \
                        -Djavax.accessibility.assistive_technologies=$atclass \
                        -Djava.ext.dirs="$JARRG_EXTDIR:$JARRG_JRE/lib/ext" \
+                       $JARRG_JAVA_OPTS \
                        "$@"
        fi
 
        real="$JARRG_JRE/bin/java"
        log "running $real $*"
-       exec "$real" "$@"
+       exec "$real" $JARRG_JAVA_OPTS "$@"
 END
 
 chmod +x -- "$wrapper"