|
@@ -23,10 +23,18 @@
|
23
|
23
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
24
|
24
|
# SOFTWARE.
|
25
|
25
|
|
26
|
|
-ISKDE=`pidof -x -s kdeinit`
|
27
|
|
-KDIALOG=`which kdialog`
|
28
|
|
-ISGNOME=`pidof -x -s gnome-panel`
|
29
|
|
-ZENITY=`which zenity`
|
|
26
|
+PIDOF=`which pidof`
|
|
27
|
+if [ "" != "${PIDOF}" ]; then
|
|
28
|
+ ISKDE=`${PIDOF} -x -s kdeinit`
|
|
29
|
+ KDIALOG=`which kdialog`
|
|
30
|
+ ISGNOME=`${PIDOF} -x -s gnome-panel`
|
|
31
|
+ ZENITY=`which zenity`
|
|
32
|
+else
|
|
33
|
+ ISKDE=""
|
|
34
|
+ KDIALOG=""
|
|
35
|
+ ISGNOME=""
|
|
36
|
+ ZENITY=""
|
|
37
|
+fi;
|
30
|
38
|
|
31
|
39
|
errordialog() {
|
32
|
40
|
# Send message to console.
|
|
@@ -47,12 +55,20 @@ errordialog() {
|
47
|
55
|
fi
|
48
|
56
|
}
|
49
|
57
|
|
|
58
|
+UNAME=`uname -a`
|
|
59
|
+isLinux=`echo ${UNAME} | grep -i linux`
|
|
60
|
+
|
50
|
61
|
echo ""
|
51
|
62
|
echo "---------------------"
|
52
|
63
|
echo "Setup.sh"
|
53
|
64
|
echo "---------------------"
|
54
|
65
|
echo -n "Looking for java.. ";
|
55
|
|
-JAVA=`which java`
|
|
66
|
+# Location where ports on FreeBSD/PCBSD installs java6
|
|
67
|
+# check it first, because it isn't added to the path automatically
|
|
68
|
+JAVA="/usr/local/jdk1.6.0/jre/bin/java"
|
|
69
|
+if [ ! -e "${JAVA}" ]; then
|
|
70
|
+ JAVA=`which java`
|
|
71
|
+fi
|
56
|
72
|
|
57
|
73
|
installjre() {
|
58
|
74
|
result=1
|
|
@@ -97,6 +113,10 @@ if [ "" != "${JAVA}" ]; then
|
97
|
113
|
echo "Success!"
|
98
|
114
|
else
|
99
|
115
|
echo "Failed!"
|
|
116
|
+ if [ "" == "${isLinux}" ]; then
|
|
117
|
+ errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without java 6."
|
|
118
|
+ exit 1
|
|
119
|
+ fi;
|
100
|
120
|
installjre "install"
|
101
|
121
|
fi
|
102
|
122
|
|
|
@@ -155,6 +175,10 @@ if [ -e "installer.jar" ]; then
|
155
|
175
|
echo "Running installer.."
|
156
|
176
|
${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}
|
157
|
177
|
if [ $? -ne 0 ]; then
|
|
178
|
+ if [ "" == "${isLinux}" ]; then
|
|
179
|
+ errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without java 6."
|
|
180
|
+ exit 1
|
|
181
|
+ fi;
|
158
|
182
|
installjre "upgrade"
|
159
|
183
|
echo "Trying to run installer again.."
|
160
|
184
|
${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}
|