blob: a819646a0cec18954fc8028c09da003aa17a9674 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
--- deepgit.orig/bin/deepgit.sh 2017-07-14 08:40:36.915613668 +0200
+++ deepgit.new/bin/deepgit.sh 2017-07-14 09:13:07.743455655 +0200
@@ -45,57 +45,33 @@
;;
esac
-# Resolve the location of the DeepGit installation.
-# This includes resolving any symlinks.
-PRG=$0
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
- if expr "$link" : '^/' 2> /dev/null >/dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
-done
-
-DEEPGIT_BIN=`dirname "$PRG"`
-
-# Absolutize dir
-oldpwd=`pwd`
-cd "${DEEPGIT_BIN}";
-DEEPGIT_BIN=`pwd`
-cd "${oldpwd}";
-unset oldpwd
+DEEPGIT_HOME=/usr/share/java/deepgit-preview
-DEEPGIT_HOME=`dirname "$DEEPGIT_BIN"`
-
-parseVmOptions $DEEPGIT_BIN/deepgit.vmoptions
+parseVmOptions /etc/deepgit-preview/deepgit.vmoptions
parseVmOptions ~/.deepgit/deepgit.vmoptions
# Determine Java Runtime
if [ "$DEEPGIT_JAVA_HOME" = "" ] ; then
DEEPGIT_JAVA_HOME=$DEEPGITHG_JAVA_HOME
fi
-if [ "$DEEPGIT_JAVA_HOME" = "" ] && [ -f "/usr/lib/jvm/java-7-openjdk-i386/jre/bin/java" ] ; then
- DEEPGIT_JAVA_HOME="/usr/lib/jvm/java-7-openjdk-i386/jre"
-fi
if [ "$DEEPGIT_JAVA_HOME" = "" ] ; then
- DEEPGIT_JAVA_HOME=$JAVA_HOME
+ _JAVA_EXEC=/usr/bin/java
+else
+ _JAVA_EXEC="java"
+ if [ "$DEEPGIT_JAVA_HOME" != "" ] ; then
+ _TMP="$DEEPGIT_JAVA_HOME/bin/java"
+ if [ -f "$_TMP" ] ; then
+ if [ -x "$_TMP" ] ; then
+ _JAVA_EXEC="$_TMP"
+ else
+ echo "Warning: $_TMP is not executable"
+ fi
+ else
+ echo "Warning: $_TMP does not exist"
+ fi
+ fi
fi
-_JAVA_EXEC="java"
-if [ "$DEEPGIT_JAVA_HOME" != "" ] ; then
- _TMP="$DEEPGIT_JAVA_HOME/bin/java"
- if [ -f "$_TMP" ] ; then
- if [ -x "$_TMP" ] ; then
- _JAVA_EXEC="$_TMP"
- else
- echo "Warning: $_TMP is not executable"
- fi
- else
- echo "Warning: $_TMP does not exist"
- fi
-fi
if ! which "$_JAVA_EXEC" >/dev/null 2>&1 ; then
echo "Error: No java environment found (JRE 1.7 or higher required)."
@@ -109,9 +85,6 @@
echoJreConfigurationAndExit
fi
-# this seems necessary for Solaris to find the Cairo-library
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/gnome-private/lib
-
if type "lsb_release" > /dev/null 2> /dev/null ; then
if [ "$XDG_CURRENT_DESKTOP" == "Unity" ] ; then
# work-around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=419729
|