From: Ian Jackson <ywiivi@fyvzl.net>
Date: Sat, 8 Apr 2023 16:12:41 +0000 (+0000)
Subject: Merge branch 'scripts' into 'main'
X-Git-Tag: jarrg-1.1.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=0ce695ae0aa6c7b6f9a07d8e8e7795fd8ef5b5ca;hp=7b5460c64b9113c87fdd93bc0fbac3762b30f6dd;p=jarrg-ian.git

Merge branch 'scripts' into 'main'

Build script etc. updats

See merge request yarrg/jarrg!2
---

diff --git a/build-sh b/build-sh
index 9bef7b3..887f236 100755
--- a/build-sh
+++ b/build-sh
@@ -10,7 +10,7 @@ case "$#.$1" in
 *)	echo >&2 'no arguments allowed'; exit 1;;
 esac
 
-: ${JAVA_HOME:=/usr/lib/jvm/java-6-sun}
+: ${JAVA_HOME:=/usr/lib/jvm/java-8-openjdk-amd64}
 export JAVA_HOME
 
 revision=`git describe --always || echo '(unknown revision)'`
diff --git a/jarrg b/jarrg
index 9b26f58..2b7b193 100755
--- a/jarrg
+++ b/jarrg
@@ -132,6 +132,7 @@ else
 		echo "   jre leaf dir: \"$jreleaf\""
 		case "$jreleaf" in
 		jre)	echo "   found jre directory, good";;
+		java-*)	echo "   found java directory, good";;
 		jre1.*)	echo "   found versioned jre directory $jreleaf, ok";;
 		*)	nojre "java binary not in jre dir ($jreleaf)";;
 		esac
@@ -171,6 +172,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 +234,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"