From ba7c70302b5c17c1e725546f0b9430621958c853 Mon Sep 17 00:00:00 2001
From: David Madl <git@abanbytes.eu>
Date: Thu, 21 Jan 2016 15:33:03 +0000
Subject: [PATCH] Make multeval.sh run from arbitrary working directory

---
 multeval.sh                | 2 +-
 src/multeval/MultEval.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/multeval.sh b/multeval.sh
index 83cb58f..ebe4867 100755
--- a/multeval.sh
+++ b/multeval.sh
@@ -21,5 +21,5 @@ done
 
 # Specify -Dfile.encoding so that the meteor paraphrase tables load properly
 java -Dfile.encoding=UTF8 $flags \
-    -cp $terJar:$meteorJar:$scriptDir/multeval-${version}.jar \
+    -cp $terJar:$meteorJar:$scriptDir/multeval-${version}.jar:$scriptDir \
     multeval.MultEval "$@"
diff --git a/src/multeval/MultEval.java b/src/multeval/MultEval.java
index 2acf795..e6b6ea8 100644
--- a/src/multeval/MultEval.java
+++ b/src/multeval/MultEval.java
@@ -4,7 +4,7 @@
 import jannopts.Configurator;
 
 import java.io.IOException;
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.Properties;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,7 +72,7 @@ static int initThreads(final List<Metric<?>> metrics, int threads) {
 
         private static String loadVersion() throws IOException {
             Properties props = new Properties();
-            FileInputStream in = new FileInputStream("constants");
+            InputStream in = MultEval.class.getResourceAsStream("/constants");
             props.load(in);
             in.close();
             String version = props.getProperty("version");