From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Apr 2023 10:08:54 +0000 (+0100)
Subject: Plumb JARRG_JAVA_OPTS through
X-Git-Tag: jarrg-1.1.0~3^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=commitdiff_plain;h=e5c47bf288363470e1b998a255b28ef1bb43cda7

Plumb JARRG_JAVA_OPTS through

I did this to try to pass hidpi options which wasn't successful, but
I'll keep it.
---

diff --git a/jarrg b/jarrg
index 9b26f58..14c8fd9 100755
--- a/jarrg
+++ b/jarrg
@@ -171,6 +171,7 @@ if $check_only; then echo "Check successful."; exit 0; fi
 set +e
 $setup_only_simulate "$realjava" \
  -Dnet.chiark.yarrg.controlpanel.exitstatus=12 \
+ $JARRG_JAVA_OPTS \
  -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e
@@ -232,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"