1 |
--- NX/scripts/setup/nxmanager.orig 2012-05-03 12:00:55.238000286 +0200 |
--- NX/scripts/setup/nxmanager.orig 2012-05-07 23:28:56.781982523 +0200 |
2 |
+++ NX/scripts/setup/nxmanager 2012-05-03 12:04:00.116999553 +0200 |
+++ NX/scripts/setup/nxmanager 2012-05-07 23:31:35.685982523 +0200 |
3 |
@@ -85,6 +85,12 @@ |
@@ -85,6 +85,12 @@ |
4 |
{ |
{ |
5 |
ret_getLinuxName=0 |
ret_getLinuxName=0 |
26 |
if [ -f /etc/debian_version ]; |
if [ -f /etc/debian_version ]; |
27 |
then |
then |
28 |
system=debian |
system=debian |
29 |
@@ -2061,6 +2073,7 @@ |
@@ -179,6 +191,9 @@ |
30 |
|
if [ -x "/bin/unlink" ]; |
31 |
|
then |
32 |
|
UNLINKCOMMAND="/bin/unlink" |
33 |
|
+elif [ -x "/usr/bin/unlink" ]; |
34 |
|
+then |
35 |
|
+ UNLINKCOMMAND="/usr/bin/unlink" |
36 |
|
elif [ -x "/usr/sbin/unlink" ]; |
37 |
|
then |
38 |
|
UNLINKCOMMAND="/usr/sbin/unlink" |
39 |
|
@@ -236,6 +251,9 @@ |
40 |
|
if [ -x "/usr/bin/awk" ]; |
41 |
|
then |
42 |
|
AWKCOMMAND="/usr/bin/awk" |
43 |
|
+ elif [ -x "/bin/awk" ]; |
44 |
|
+ then |
45 |
|
+ AWKCOMMAND="/bin/awk" |
46 |
|
else |
47 |
|
AWKCOMMAND="awk" |
48 |
|
fi |
49 |
|
@@ -293,7 +311,7 @@ |
50 |
|
SEDCOMMAND="sed" |
51 |
|
fi |
52 |
|
else |
53 |
|
- if [ -x "/bin/grep" ]; |
54 |
|
+ if [ -x "/bin/sed" ]; |
55 |
|
then |
56 |
|
SEDCOMMAND="/bin/sed" |
57 |
|
else |
58 |
|
@@ -480,6 +498,9 @@ |
59 |
|
if [ -x "/sbin/pidof" ]; |
60 |
|
then |
61 |
|
PIDOFCOMMAND="/sbin/pidof" |
62 |
|
+elif [ -x "/bin/pidof" ]; |
63 |
|
+then |
64 |
|
+ PIDOFCOMMAND="/bin/pidof" |
65 |
|
else |
66 |
|
PIDOFCOMMAND="pidof" |
67 |
|
fi |
68 |
|
@@ -2061,6 +2082,7 @@ |
69 |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
70 |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
71 |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
73 |
} |
} |
74 |
|
|
75 |
updatePathsInFile () |
updatePathsInFile () |
76 |
@@ -3001,6 +3014,9 @@ |
@@ -3001,6 +3023,9 @@ |
77 |
elif [ "$system" = "fedora" ]; |
elif [ "$system" = "fedora" ]; |
78 |
then |
then |
79 |
detectedSystem="Fedora" |
detectedSystem="Fedora" |
83 |
elif [ "$system" = "debian" ]; |
elif [ "$system" = "debian" ]; |
84 |
then |
then |
85 |
detectedSystem="Debian" |
detectedSystem="Debian" |
86 |
@@ -3390,6 +3406,7 @@ |
@@ -3390,6 +3415,7 @@ |
87 |
"suse" ) ;; |
"suse" ) ;; |
88 |
"mandriva" ) ;; |
"mandriva" ) ;; |
89 |
"fedora" ) ;; |
"fedora" ) ;; |
91 |
"debian" ) ;; |
"debian" ) ;; |
92 |
"solaris" ) ;; |
"solaris" ) ;; |
93 |
"macosx" ) ;; |
"macosx" ) ;; |
94 |
@@ -3530,6 +3547,7 @@ |
@@ -3530,6 +3556,7 @@ |
95 |
/etc/debian_version |
/etc/debian_version |
96 |
/etc/debian_release |
/etc/debian_release |
97 |
/etc/fedora-release |
/etc/fedora-release |
99 |
/etc/gentoo-release |
/etc/gentoo-release |
100 |
/etc/immunix-release |
/etc/immunix-release |
101 |
knoppix_version |
knoppix_version |
102 |
@@ -3559,6 +3577,7 @@ |
@@ -3559,6 +3586,7 @@ |
103 |
/etc/va-release |
/etc/va-release |
104 |
/etc/yellowdog-release |
/etc/yellowdog-release |
105 |
/etc/system-release |
/etc/system-release |
107 |
) |
) |
108 |
|
|
109 |
getVersionFromLSB() |
getVersionFromLSB() |
110 |
|
--- NX/scripts/etc/nxmanager.orig 2012-05-07 23:27:49.332982523 +0200 |
111 |
|
+++ NX/scripts/etc/nxmanager 2012-05-07 23:28:38.170982523 +0200 |
112 |
|
@@ -19,6 +19,9 @@ |
113 |
|
elif [ -x /usr/bin/awk ] |
114 |
|
then |
115 |
|
COMMAND_AWK="/usr/bin/awk" |
116 |
|
+elif [ -x /bin/awk ] |
117 |
|
+then |
118 |
|
+ COMMAND_AWK="/bin/awk" |
119 |
|
else |
120 |
|
COMMAND_AWK="awk" |
121 |
|
fi |