X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=blobdiff_plain;f=jarrg;fp=jpctb;h=09dbbcde15a998531992d535b0ebc7eff6f10378;hp=50f295298b14b58b3cd688eafb23c4bef19aaaac;hb=9ad21c9f459da2539c8b537af8e8bfb32b22f89d;hpb=bc8471453c90b29dc162119866f0f2b73dec5081

diff --git a/jpctb b/jarrg
similarity index 85%
rename from jpctb
rename to jarrg
index 50f2952..09dbbcd 100755
--- a/jpctb
+++ b/jarrg
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is jpctb, a wrapper script for plumbing Ted Pearson's Java PCTB
+# This is jarrg, a wrapper script for plumbing Ted Pearson's Java PCTB
 # client into a JVM on Linux.
 
 # This program is Free Software.  Copyright (C) 2009 Ian Jackson.
@@ -24,12 +24,12 @@
 
 
 usage () { cat <<END
-usage: .../jpctb /path/to/yohoho/yohoho [...]
+usage: .../jarrg /path/to/yohoho/yohoho [...]
 END
 }
 
 fail () {
-	echo >&2 "jpctb: $*"
+	echo >&2 "jarrg: $*"
 	exit 127
 }
 
@@ -50,10 +50,10 @@ setup_only_simulate=''
 while [ $# -ge 1 ]; do
 	case "$1" in
 	-)		shift; break;;
-	--jpctb)
+	--jarrg)
 			shift
 			srcjardir="$1"
-			shift || badusage "--jpctb needs a value"
+			shift || badusage "--jarrg needs a value"
 			;;
 	--check-only)
 			check_only=true
@@ -77,16 +77,16 @@ yohoho="$1"; shift
 
 #---------- find ourselves ----------
 
-jpctbdir="$0"
-jpctbdir="${jpctbdir%/*}"
+jarrgdir="$0"
+jarrgdir="${jarrgdir%/*}"
 
-case "$jpctbdir" in
+case "$jarrgdir" in
 /*)	;;
-*)	jpctbdir="$PWD/$jpctbdir" ;;
+*)	jarrgdir="$PWD/$jarrgdir" ;;
 esac
 
 if [ x"$srcjardir" = x ]; then
-	srcjardir="$jpctbdir"
+	srcjardir="$jarrgdir"
 fi
 
 #---------- find YPP client and the Java installation it uses ----------
@@ -105,8 +105,8 @@ else
 fi
 
 cat <<END
-jpctb:
-   jpctb tree:	 "$jpctbdir"
+jarrg:
+   jarrg tree:	 "$jarrgdir"
    yohoho:       "$yohoho"
    ypp dir:      "$yppdir"
    ypp uses:     "$yppjava"
@@ -147,21 +147,21 @@ case "$javadir" in
 *)		javadir="$PWD/$javadir" ;;
 esac
 
-jtmp="$jpctbdir/tmp"
+jtmp="$jarrgdir/tmp"
 linkfarm="$jtmp/linkfarm"
 extdir="$jtmp/ext"
 
-export JPCTB_JRE="$javadir/$jreleaf"
-realjava="$JPCTB_JRE/bin/java"
+export JARRG_JRE="$javadir/$jreleaf"
+realjava="$JARRG_JRE/bin/java"
 
 #---------- confirm for the user which paths we're using ----------
 
 cat <<END
    java dir.:    "$javadir"
-   jre:          "$JPCTB_JRE"
+   jre:          "$JARRG_JRE"
    primary java: "$realjava"
-   jpctb jars:   "$srcjardir"
-   jpctb tmpdir: "$jtmp"
+   jarrg jars:   "$srcjardir"
+   jarrg tmpdir: "$jtmp"
 END
 
 #---------- run the control panel ----------
@@ -197,14 +197,14 @@ cp -Rs "$javadir"/. "$linkfarm"/.
 wrapper="$linkfarm"/$jreleaf/bin/java
 rm -- "$wrapper"
 
-export JPCTB_EXTDIR="$extdir"
+export JARRG_EXTDIR="$extdir"
 
 cat <<'END' >"$wrapper"
 #!/bin/bash
-	set -e$JPCTB_JWRAP_X
+	set -e$JARRG_JWRAP_X
 
 	log () {
-		lh=`date +'%Y/%m/%d %H:%M:%S jpctb'`
+		lh=`date +'%Y/%m/%d %H:%M:%S jarrg'`
 		printf >&2 "%s: %s |\f\n" "$lh" "$*"
 	}
 
@@ -222,19 +222,19 @@ cat <<'END' >"$wrapper"
 	nargs=${#args[*]}
 	lastarg="${args[$(( $nargs - 1 ))]}"
 
-	fail () { echo >&2 "jpctb-java: $*"; exit 127; }
+	fail () { echo >&2 "jarrg-java: $*"; exit 127; }
 
 	if [ x"$lastarg" = x"$yppclass" ]; then
 
-		[ x"$JPCTB_EXTDIR" != x ] || fail 'JPCTB_EXTDIR not set'
+		[ x"$JARRG_EXTDIR" != x ] || fail 'JARRG_EXTDIR not set'
 
-	        set     -e$JPCTB_JWRAP_X -- \
+	        set     -e$JARRG_JWRAP_X -- \
 	                -Djavax.accessibility.assistive_technologies=$atclass \
-	                -Djava.ext.dirs="$JPCTB_EXTDIR:$JPCTB_JRE/lib/ext" \
+	                -Djava.ext.dirs="$JARRG_EXTDIR:$JARRG_JRE/lib/ext" \
 	                "$@"
 	fi
 
-	real="$JPCTB_JRE/bin/java"
+	real="$JARRG_JRE/bin/java"
 	log "running $real $*"
 	exec "$real" "$@"
 END