Merge branch 'tidy' into 'main'

[jarrg-ian.git] / jarrg

diff --git a/jarrg b/jarrg
index 09dbbcde15a998531992d535b0ebc7eff6f10378..2b7b1939eabf47ac5e2d5d4fde9b0856da95cce2 100755 (executable)
--- a/jarrg
+++ b/jarrg
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is jarrg, a wrapper script for plumbing Ted Pearson's Java PCTB
+# This is jarrg, a wrapper script for plumbing the Jarrg
 # client into a JVM on Linux.
 
 # This program is Free Software.  Copyright (C) 2009 Ian Jackson.
@@ -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
@@ -170,8 +171,9 @@ if $check_only; then echo "Check successful."; exit 0; fi
 
 set +e
 $setup_only_simulate "$realjava" \
- -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
- -jar "$srcjardir/PCTB-ControlPanel.jar"
+ -Dnet.chiark.yarrg.controlpanel.exitstatus=12 \
+ $JARRG_JAVA_OPTS \
+ -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e
 
@@ -188,7 +190,7 @@ esac
 
 rm -rf -- "$jtmp"
 mkdir -- "$jtmp" "$extdir" "$linkfarm"
-cp "$srcjardir"/PCTB*.jar "$extdir"
+cp "$srcjardir"/Jarrg*.jar "$extdir"
 
 cp -Rs "$javadir"/. "$linkfarm"/.
 
@@ -216,7 +218,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 +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"