Selaa lähdekoodia

I'm sure I already fixed this... If pidof is found use it, rather than only trying to use it if its not found..


git-svn-id: http://svn.dmdirc.com/trunk@4223 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 vuotta sitten
vanhempi
commit
fcb653f4b4

+ 1
- 1
installer/linux/getjre.sh Näytä tiedosto

@@ -14,7 +14,7 @@ if [ "${PIDOF}" = "" ]; then
14 14
 fi;
15 15
 
16 16
 ## Helper Functions
17
-if [ "${PIDOF}" = "" ]; then
17
+if [ "${PIDOF}" != "" ]; then
18 18
 	ISKDE=`${PIDOF} -x -s kdeinit`
19 19
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
20 20
 else

+ 3
- 3
installer/linux/installerstub.sh Näytä tiedosto

@@ -26,8 +26,8 @@
26 26
 MD5=""
27 27
 
28 28
 # Check the which command exists
29
-WHICH=`which`
30
-if [ "" != "${WHICH}" ]; then
29
+WHICH=`which which 2>/dev/null`
30
+if [ "" = "${WHICH}" ]; then
31 31
 	echo "which command not found. Aborting.";
32 32
 	exit 0;
33 33
 fi
@@ -56,7 +56,7 @@ errordialog() {
56 56
 	fi;
57 57
 	
58 58
 	## Helper Functions
59
-	if [ "${PIDOF}" = "" ]; then
59
+	if [ "${PIDOF}" != "" ]; then
60 60
 		ISKDE=`${PIDOF} -x -s kdeinit`
61 61
 		ISGNOME=`${PIDOF} -x -s gnome-panel`
62 62
 	else

+ 1
- 1
installer/linux/installjre.sh Näytä tiedosto

@@ -14,7 +14,7 @@ if [ "${PIDOF}" = "" ]; then
14 14
 fi;
15 15
 
16 16
 ## Helper Functions
17
-if [ "${PIDOF}" = "" ]; then
17
+if [ "${PIDOF}" != "" ]; then
18 18
 	ISKDE=`${PIDOF} -x -s kdeinit`
19 19
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
20 20
 else

+ 1
- 1
installer/linux/progressbar.sh Näytä tiedosto

@@ -21,7 +21,7 @@ if [ "${PIDOF}" = "" ]; then
21 21
 fi;
22 22
 
23 23
 ## Helper Functions
24
-if [ "${PIDOF}" = "" ]; then
24
+if [ "${PIDOF}" != "" ]; then
25 25
 	ISKDE=`${PIDOF} -x -s kdeinit`
26 26
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
27 27
 else

+ 1
- 1
installer/linux/setup.sh Näytä tiedosto

@@ -34,7 +34,7 @@ if [ "${PIDOF}" = "" ]; then
34 34
 fi;
35 35
 
36 36
 ## Helper Functions
37
-if [ "${PIDOF}" = "" ]; then
37
+if [ "${PIDOF}" != "" ]; then
38 38
 	ISKDE=`${PIDOF} -x -s kdeinit`
39 39
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
40 40
 else

Loading…
Peruuta
Tallenna