tjh.dev
1diff --git a/install b/install
2index 95afa2c..70c5fca 100755
3--- a/install
4+++ b/install
5@@ -1,4 +1,4 @@
6-#!/bin/bash
7+#!@bash@/bin/bash
8
9 echo "BonnMotion - a mobility scenario generation and analysis tool"
10 echo "Copyright (C) 2002-2012 University of Bonn"
11@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software"
12 echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
13 echo
14
15-OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//`
16-
17 PACKAGE=edu.bonn.cs.iv.bonnmotion
18-JAVAPATH=`which java 2> /dev/null`
19-if [ ! "$JAVAPATH" = "" ]
20-then
21- JAVAPATH=`dirname ${JAVAPATH}`
22-fi
23-echo -n Please enter your Java binary path \[$JAVAPATH\]:\
24-read KBDENTRY
25-if [ ! "$KBDENTRY" = "" ]
26-then
27- JAVAPATH=$KBDENTRY
28-fi
29+JAVAPATH="@jre@/bin"
30 if [ -x "${JAVAPATH}/java" ]
31 then
32- cd `dirname $0`
33- BONNMOTION=`pwd`
34-
35- cd "${JAVAPATH}"
36- JAVAPATH=`pwd`
37- cd "${BONNMOTION}"
38+ BONNMOTION="$(realpath .)"
39
40 CLASSPATH="${BONNMOTION}/classes"
41 DOCPATH="${BONNMOTION}/javadoc"
42@@ -52,14 +35,7 @@ then
43 then
44 mkdir "${DOCPATH}"
45 fi
46- if [ $OS = "cygwin" ]
47- then
48- cd "${CLASSPATH}"
49- CLASSPATH=`cmd.exe /c cd`
50- cd "${DOCPATH}"
51- DOCPATH=`cmd.exe /c cd`
52- fi
53-
54+
55 for l in $BONNMOTION/lib/*.jar
56 do
57 LIBRARYPATH=$LIBRARYPATH:$l
58@@ -69,7 +45,7 @@ then
59 APPS=`ls`
60 cd "${BONNMOTION}/bin"
61
62- echo \#\!/bin/bash > .head
63+ echo \#\!@bash@/bin/bash > .head
64 echo >> .head
65 echo BONNMOTION=\"$BONNMOTION\" >> .head
66 echo PACKAGE=\"$PACKAGE\" >> .head
67@@ -103,8 +79,6 @@ then
68 fi
69 echo "done."
70 echo
71- echo "$ ./bin/bm -h"
72- ./bm
73 else
74 echo No executable \"$JAVAPATH/java\", aborting.
75 fi