1 |
--- NX/scripts/setup/nxclient.orig 2012-05-03 11:19:36.368003765 +0200 |
--- NX/scripts/setup/nxclient.orig 2012-05-07 23:19:21.137982523 +0200 |
2 |
+++ NX/scripts/setup/nxclient 2012-05-03 11:23:42.949003354 +0200 |
+++ NX/scripts/setup/nxclient 2012-05-07 23:26:11.913982523 +0200 |
3 |
@@ -85,6 +85,13 @@ |
@@ -85,6 +85,13 @@ |
4 |
{ |
{ |
5 |
ret_getLinuxName=0 |
ret_getLinuxName=0 |
27 |
if [ -f /etc/debian_version ]; |
if [ -f /etc/debian_version ]; |
28 |
then |
then |
29 |
system=debian |
system=debian |
30 |
@@ -2061,6 +2074,7 @@ |
@@ -179,6 +192,9 @@ |
31 |
|
if [ -x "/bin/unlink" ]; |
32 |
|
then |
33 |
|
UNLINKCOMMAND="/bin/unlink" |
34 |
|
+elif [ -x "/usr/bin/unlink" ]; |
35 |
|
+then |
36 |
|
+ UNLINKCOMMAND="/usr/bin/unlink" |
37 |
|
elif [ -x "/usr/sbin/unlink" ]; |
38 |
|
then |
39 |
|
UNLINKCOMMAND="/usr/sbin/unlink" |
40 |
|
@@ -293,7 +309,7 @@ |
41 |
|
SEDCOMMAND="sed" |
42 |
|
fi |
43 |
|
else |
44 |
|
- if [ -x "/bin/grep" ]; |
45 |
|
+ if [ -x "/bin/sed" ]; |
46 |
|
then |
47 |
|
SEDCOMMAND="/bin/sed" |
48 |
|
else |
49 |
|
@@ -480,6 +496,9 @@ |
50 |
|
if [ -x "/sbin/pidof" ]; |
51 |
|
then |
52 |
|
PIDOFCOMMAND="/sbin/pidof" |
53 |
|
+elif [ -x "/bin/pidof" ]; |
54 |
|
+then |
55 |
|
+ PIDOFCOMMAND="/bin/pidof" |
56 |
|
else |
57 |
|
PIDOFCOMMAND="pidof" |
58 |
|
fi |
59 |
|
@@ -2061,6 +2080,7 @@ |
60 |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
61 |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
62 |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
64 |
} |
} |
65 |
|
|
66 |
updatePathsInFile () |
updatePathsInFile () |
67 |
@@ -3001,6 +3015,9 @@ |
@@ -3001,6 +3021,9 @@ |
68 |
elif [ "$system" = "fedora" ]; |
elif [ "$system" = "fedora" ]; |
69 |
then |
then |
70 |
detectedSystem="Fedora" |
detectedSystem="Fedora" |
74 |
elif [ "$system" = "debian" ]; |
elif [ "$system" = "debian" ]; |
75 |
then |
then |
76 |
detectedSystem="Debian" |
detectedSystem="Debian" |
77 |
@@ -3390,6 +3407,7 @@ |
@@ -3390,6 +3413,7 @@ |
78 |
"suse" ) ;; |
"suse" ) ;; |
79 |
"mandriva" ) ;; |
"mandriva" ) ;; |
80 |
"fedora" ) ;; |
"fedora" ) ;; |
82 |
"debian" ) ;; |
"debian" ) ;; |
83 |
"solaris" ) ;; |
"solaris" ) ;; |
84 |
"macosx" ) ;; |
"macosx" ) ;; |
85 |
@@ -3530,6 +3548,7 @@ |
@@ -3530,6 +3554,7 @@ |
86 |
/etc/debian_version |
/etc/debian_version |
87 |
/etc/debian_release |
/etc/debian_release |
88 |
/etc/fedora-release |
/etc/fedora-release |
90 |
/etc/gentoo-release |
/etc/gentoo-release |
91 |
/etc/immunix-release |
/etc/immunix-release |
92 |
knoppix_version |
knoppix_version |
93 |
@@ -3559,6 +3578,7 @@ |
@@ -3559,6 +3584,7 @@ |
94 |
/etc/va-release |
/etc/va-release |
95 |
/etc/yellowdog-release |
/etc/yellowdog-release |
96 |
/etc/system-release |
/etc/system-release |