Support env vars: TLA_JAVA_{,_OPTS},TLC_{JAVA_,}OPTS

11 files changed, 21 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3d63c05b9823..fa7016cf0cf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,16 +23,16 @@ source=(
 )
 noextract=('tla2tools.jar')
 sha256sums=('1626add371f8e198ea23f86d16d0c72166978456baaa61f1afec901283b92595'
-            '9ad7854b6e5ce959ed8be9b6d0bf526b8197b1688881735713e2a6be99a35d18'
-            'cfbc8a12b0c9071ecf8908f2b3df29fba791e174002209c0d73d24485453f3b8'
-            '93fa12167a3d695a8b43dce9b3610fdd33f3f3e1ebb97121c3f05f871454e1ba'
-            'c5b185bc06a0010b762100d530d9a5ecfbd0dc8fb2bb464001ed3017be4a592e'
-            '7a19ee7fa00dd8502aa274abbf6b3cc39c205e78c738bd04bb5a4ee9ac83bfd2'
-            '555ccfa5e688430cad3d9daf6c3cdf3602808c05b0a99d53f9e371b5e7b3773c'
-            '212e01529d197aa9fa638851d6a03c3d5cf8a7eace6c05e44729ed7d60323f5c'
-            '41010eada1dedb7c78e5af8222a113447bfd95393611aebb18fc392496a36e6b'
-            '4099bd05576956bd345a2177fd8556117bee7ede43d51e87eb497c0e382251cc'
-)
+            '06a0cc6028cec61252896d0b1b88282efd972de1e37ea7980a5e607b55a0257e'
+            '5517975359e764114cb231e3c80862dc24b800d5f11444b9c99cccaa5df11195'
+            '1ed9e18cf3036f71ffb5f66ba53d4b13a46535ec6687185dd2b2f25a3aa2c051'
+            '1a0dcaebefe29e330aaf6ac42da41cd8ad5059d5f10411abf2063d2ef68c87af'
+            'bb661b1c30aa343f1c34e9cf9a19f9abaf974e1b124a2c1311c470ba79bf5935'
+            '3ae8122f331b3aa9cd1952571d4bbc58d98246ec2e6f58bdfa9ce973fa7afc87'
+            'fedb2f21d93526495ca4b8b6b10a6f37d6d4099d06a9203426b7c5f7c6996419'
+            '450b00da072989f41f8cec7e6fdf535d8acdc31472d9372071a1ce769b860073'
+            '7e1d17b97168d3d1359332c0311865d0a24ff4066b6640e802a1a7ee01a0e165')
+
 
 package() {
   mkdir -p "$pkgdir/usr/share/java" "$pkgdir/usr/bin"
diff --git a/pcal b/pcal
index b300549c6fc2..1d221191045b 100755
--- a/pcal
+++ b/pcal
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools pcal.trans "$@"
+exec "$(dirname "$0")"/tla-tools pcal.trans "$@"
diff --git a/tla-tools b/tla-tools
index 878a3e92eb1e..a9cfccc67b2c 100755
--- a/tla-tools
+++ b/tla-tools
@@ -1,2 +1,2 @@
-#!/bin/sh
-exec java -classpath /usr/share/java/tla2tools.jar "$@"
+#!/bin/bash
+exec ${TLA_JAVA:-java} $TLA_JAVA_OPTS -classpath /usr/share/java/tla2tools.jar "$@"
diff --git a/tla2sany b/tla2sany
index 1df81973d7c8..7b6595dddf29 100755
--- a/tla2sany
+++ b/tla2sany
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tla2sany.SANY "$@"
+exec "$(dirname "$0")"/tla-tools tla2sany.SANY "$@"
diff --git a/tla2tex b/tla2tex
index 1ca0ac7f44d5..748e9889a5c0 100755
--- a/tla2tex
+++ b/tla2tex
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tla2tex.TLA "$@"
+exec "$(dirname "$0")"/tla-tools tla2tex.TLA "$@"
diff --git a/tlc b/tlc
index f937d6773343..0c4ce0446da1 100755
--- a/tlc
+++ b/tlc
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tlc2.TLC "$@"
+TLA_JAVA_OPTS="$TLA_JAVA_OPTS $TLC_JAVA_OPTS" exec "$(dirname "$0")"/tla-tools tlc2.TLC $TLC_OPTS "$@"
diff --git a/tlc-colour b/tlc-colour
index a588402e3047..f5535a6f41bf 100755
--- a/tlc-colour
+++ b/tlc-colour
@@ -14,6 +14,6 @@ if [ $# -eq 0 ]; then
 else
 
   # Run tlc
-  exec tlc "$@" | "$0"
+  exec "$(dirname "$0")"/tlc "$@" | "$0"
 
 fi
diff --git a/tlc-dist-fp b/tlc-dist-fp
index dccc6ac9c4ee..6fce23995fb3 100755
--- a/tlc-dist-fp
+++ b/tlc-dist-fp
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tlc2.tool.distributed.fp.DistributedFPSet "$@"
+exec "$(dirname "$0")"/tla-tools tlc2.tool.distributed.fp.DistributedFPSet "$@"
diff --git a/tlc-dist-server b/tlc-dist-server
index 0735edec1958..da1d1d9f6eed 100755
--- a/tlc-dist-server
+++ b/tlc-dist-server
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tlc2.tool.distributed.TLCServer "$@"
+exec "$(dirname "$0")"/tla-tools tlc2.tool.distributed.TLCServer "$@"
diff --git a/tlc-dist-worker b/tlc-dist-worker
index ed328b08ade6..4deb81433a5f 100755
--- a/tlc-dist-worker
+++ b/tlc-dist-worker
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tlc2.tool.distributed.TLCWorker "$@"
+exec "$(dirname "$0")"/tla-tools tlc2.tool.distributed.TLCWorker "$@"
diff --git a/tlc-dist-workerfp b/tlc-dist-workerfp
index 1461db0650b2..b9d51416c00f 100755
--- a/tlc-dist-workerfp
+++ b/tlc-dist-workerfp
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec tla-tools tlc2.tool.distributed.fp.TLCWorkerAndFPSet "$@"
+exec "$(dirname "$0")"/tla-tools tlc2.tool.distributed.fp.TLCWorkerAndFPSet "$@"