1 |
--- NX/scripts/setup/nxserver.orig 2012-05-03 11:44:18.486001418 +0200 |
--- NX/scripts/setup/nxserver.orig 2012-05-07 22:48:36.539982523 +0200 |
2 |
+++ NX/scripts/setup/nxserver 2012-05-03 11:59:12.624000346 +0200 |
+++ NX/scripts/setup/nxserver 2012-05-07 23:44:41.106982523 +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 |
|
@@ -236,6 +252,9 @@ |
41 |
|
if [ -x "/usr/bin/awk" ]; |
42 |
|
then |
43 |
|
AWKCOMMAND="/usr/bin/awk" |
44 |
|
+ elif [ -x "/bin/awk" ]; |
45 |
|
+ then |
46 |
|
+ AWKCOMMAND="/bin/awk" |
47 |
|
else |
48 |
|
AWKCOMMAND="awk" |
49 |
|
fi |
50 |
|
@@ -293,7 +312,7 @@ |
51 |
|
SEDCOMMAND="sed" |
52 |
|
fi |
53 |
|
else |
54 |
|
- if [ -x "/bin/grep" ]; |
55 |
|
+ if [ -x "/bin/sed" ]; |
56 |
|
then |
57 |
|
SEDCOMMAND="/bin/sed" |
58 |
|
else |
59 |
|
@@ -480,6 +499,9 @@ |
60 |
|
if [ -x "/sbin/pidof" ]; |
61 |
|
then |
62 |
|
PIDOFCOMMAND="/sbin/pidof" |
63 |
|
+elif [ -x "/bin/pidof" ]; |
64 |
|
+then |
65 |
|
+ PIDOFCOMMAND="/bin/pidof" |
66 |
|
else |
67 |
|
PIDOFCOMMAND="pidof" |
68 |
|
fi |
69 |
|
@@ -2061,6 +2083,7 @@ |
70 |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
71 |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
72 |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
74 |
} |
} |
75 |
|
|
76 |
updatePathsInFile () |
updatePathsInFile () |
77 |
@@ -3001,6 +3015,9 @@ |
@@ -3001,6 +3024,9 @@ |
78 |
elif [ "$system" = "fedora" ]; |
elif [ "$system" = "fedora" ]; |
79 |
then |
then |
80 |
detectedSystem="Fedora" |
detectedSystem="Fedora" |
84 |
elif [ "$system" = "debian" ]; |
elif [ "$system" = "debian" ]; |
85 |
then |
then |
86 |
detectedSystem="Debian" |
detectedSystem="Debian" |
87 |
@@ -3390,6 +3407,7 @@ |
@@ -3390,6 +3416,7 @@ |
88 |
"suse" ) ;; |
"suse" ) ;; |
89 |
"mandriva" ) ;; |
"mandriva" ) ;; |
90 |
"fedora" ) ;; |
"fedora" ) ;; |
92 |
"debian" ) ;; |
"debian" ) ;; |
93 |
"solaris" ) ;; |
"solaris" ) ;; |
94 |
"macosx" ) ;; |
"macosx" ) ;; |
95 |
@@ -3530,6 +3548,7 @@ |
@@ -3530,6 +3557,7 @@ |
96 |
/etc/debian_version |
/etc/debian_version |
97 |
/etc/debian_release |
/etc/debian_release |
98 |
/etc/fedora-release |
/etc/fedora-release |
100 |
/etc/gentoo-release |
/etc/gentoo-release |
101 |
/etc/immunix-release |
/etc/immunix-release |
102 |
knoppix_version |
knoppix_version |
103 |
@@ -3559,6 +3578,7 @@ |
@@ -3559,6 +3587,7 @@ |
104 |
/etc/va-release |
/etc/va-release |
105 |
/etc/yellowdog-release |
/etc/yellowdog-release |
106 |
/etc/system-release |
/etc/system-release |
108 |
) |
) |
109 |
|
|
110 |
getVersionFromLSB() |
getVersionFromLSB() |
111 |
@@ -5007,6 +5027,12 @@ |
@@ -5007,6 +5036,12 @@ |
112 |
|
|
113 |
removeNXinit () { |
removeNXinit () { |
114 |
|
|
121 |
if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; |
if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; |
122 |
then |
then |
123 |
if [ -f "/sbin/chkconfig" ]; |
if [ -f "/sbin/chkconfig" ]; |
124 |
@@ -5215,6 +5241,12 @@ |
@@ -5215,6 +5250,12 @@ |
125 |
|
|
126 |
addNXinit () { |
addNXinit () { |
127 |
|
|
134 |
if [ "${system}" = "macosx" ]; |
if [ "${system}" = "macosx" ]; |
135 |
then |
then |
136 |
return 0 |
return 0 |
137 |
@@ -7656,6 +7688,7 @@ |
@@ -7656,6 +7697,7 @@ |
138 |
/etc/server-fedora.cfg.sample |
/etc/server-fedora.cfg.sample |
139 |
/etc/server-mandriva.cfg.sample |
/etc/server-mandriva.cfg.sample |
140 |
/etc/server-redhat.cfg.sample |
/etc/server-redhat.cfg.sample |
142 |
/etc/server-suse.cfg.sample |
/etc/server-suse.cfg.sample |
143 |
/etc/server-solaris.cfg.sample |
/etc/server-solaris.cfg.sample |
144 |
/etc/server-macosx.cfg.sample |
/etc/server-macosx.cfg.sample |
145 |
@@ -8707,6 +8740,12 @@ |
@@ -8707,6 +8749,12 @@ |
146 |
|
|
147 |
addNxhttpdUserLinux () { |
addNxhttpdUserLinux () { |
148 |
|
|
155 |
checkNxhttpdGroupExist |
checkNxhttpdGroupExist |
156 |
if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; |
if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; |
157 |
then |
then |
158 |
|
--- NX/scripts/etc/nxserver.orig 2012-05-07 22:58:20.445982523 +0200 |
159 |
|
+++ NX/scripts/etc/nxserver 2012-05-07 22:58:34.831982523 +0200 |
160 |
|
@@ -19,6 +19,9 @@ |
161 |
|
elif [ -x /usr/bin/awk ] |
162 |
|
then |
163 |
|
COMMAND_AWK="/usr/bin/awk" |
164 |
|
+elif [ -x /bin/awk ] |
165 |
|
+then |
166 |
|
+ COMMAND_AWK="/bin/awk" |
167 |
|
else |
168 |
|
COMMAND_AWK="awk" |
169 |
|
fi |