summaryrefslogtreecommitdiff
blob: b8017ad9b524917fe94587fd160639454ef06a56 (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
--- usr/bin/webcamstudio.orig	2012-02-01 16:15:30.052483028 +0100
+++ usr/bin/webcamstudio	2012-02-01 16:16:23.370816457 +0100
@@ -3,14 +3,6 @@
 # Patrick Balleux 2009
 # Version 0.57beta4
 INSTALLDIR=/usr/lib/webcamstudio
-JAVA_DIR=/usr/lib/jvm/java-6-openjdk/bin
-if [ -f $JAVA_DIR/java ]
-then
-    JAVA_DIR=/usr/lib/jvm/java-6-openjdk/bin
-else
-    JAVA_DIR=/usr/lib/jvm/java-6-sun/bin
-fi
-echo "Using JRE: $JAVA_DIR"
 
 PADSP=
 if [ -f /usr/bin/padsp ] 
@@ -39,5 +31,5 @@ fi
 #    echo "You are not part of the video group"
 #    zenity --warning --text "You are not part of the video group!  Make sure that your user is part of the video group for access to the virtual webcam device..."
 #fi
-exec -a webcamstudio $JAVA_DIR/java -jar $INSTALLDIR/WebcamStudio.jar $1 $2 $3 $4 $5 $6 $7 $8 $9
+exec -a webcamstudio $JAVA_HOME/bin/java -jar $INSTALLDIR/WebcamStudio.jar $1 $2 $3 $4 $5 $6 $7 $8 $9