From ea64b45967ee654c3523c3130f5bf1f8d1c55571 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Sat, 12 May 2012 09:57:07 +0000
Subject: added make-install, fixed shell wrappers to work with installed
 gnunet-java

---
 bin/gnunet-dht        |  9 ++++++++-
 bin/gnunet-nse        | 11 +++++++++--
 bin/gnunet-resolver   |  9 ++++++++-
 bin/gnunet-statistics |  9 ++++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/gnunet-dht b/bin/gnunet-dht
index 1c298e1..935dad0 100755
--- a/bin/gnunet-dht
+++ b/bin/gnunet-dht
@@ -2,5 +2,12 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.dht.DistributedHashTable "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.dht.DistributedHashTable "$@"
 
diff --git a/bin/gnunet-nse b/bin/gnunet-nse
index 0edcff2..90cd027 100755
--- a/bin/gnunet-nse
+++ b/bin/gnunet-nse
@@ -1,5 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.nse.NetworkSizeEstimation "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.nse.NetworkSizeEstimation "$@"
diff --git a/bin/gnunet-resolver b/bin/gnunet-resolver
index 569df90..42aba41 100755
--- a/bin/gnunet-resolver
+++ b/bin/gnunet-resolver
@@ -2,5 +2,12 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.util.Resolver "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.util.Resolver "$@"
 
diff --git a/bin/gnunet-statistics b/bin/gnunet-statistics
index c691680..278d915 100755
--- a/bin/gnunet-statistics
+++ b/bin/gnunet-statistics
@@ -2,4 +2,11 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.statistics.Statistics "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.statistics.Statistics "$@"
-- 
cgit v1.2.3