1 |
--- NX/scripts/setup/nxwebplayer.orig 2012-05-03 13:02:35.860995683 +0200 |
--- NX/scripts/setup/nxwebplayer.orig 2012-05-07 23:45:55.981982523 +0200 |
2 |
+++ NX/scripts/setup/nxwebplayer 2012-05-03 13:05:06.314993623 +0200 |
+++ NX/scripts/setup/nxwebplayer 2012-05-07 23:47:10.230982523 +0200 |
3 |
@@ -86,6 +86,13 @@ |
@@ -86,6 +86,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 |
@@ -2062,6 +2075,7 @@ |
@@ -180,6 +193,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 |
|
@@ -237,6 +253,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 |
|
@@ -294,7 +313,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 |
|
@@ -481,6 +500,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 |
|
@@ -2062,6 +2084,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 |
@@ -3002,6 +3016,9 @@ |
@@ -3002,6 +3025,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 |
@@ -3391,6 +3408,7 @@ |
@@ -3391,6 +3417,7 @@ |
88 |
"suse" ) ;; |
"suse" ) ;; |
89 |
"mandriva" ) ;; |
"mandriva" ) ;; |
90 |
"fedora" ) ;; |
"fedora" ) ;; |
92 |
"debian" ) ;; |
"debian" ) ;; |
93 |
"solaris" ) ;; |
"solaris" ) ;; |
94 |
"macosx" ) ;; |
"macosx" ) ;; |
95 |
@@ -3531,6 +3549,7 @@ |
@@ -3531,6 +3558,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 |
@@ -3560,6 +3579,7 @@ |
@@ -3560,6 +3588,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 |
|
--- NX/scripts/etc/nxwebplayer.orig 2012-05-07 23:45:49.040982523 +0200 |
112 |
|
+++ NX/scripts/etc/nxwebplayer 2012-05-07 23:47:32.261982523 +0200 |
113 |
|
@@ -19,6 +19,9 @@ |
114 |
|
elif [ -x /usr/bin/awk ] |
115 |
|
then |
116 |
|
COMMAND_AWK="/usr/bin/awk" |
117 |
|
+elif [ -x /bin/awk ] |
118 |
|
+then |
119 |
|
+ COMMAND_AWK="/bin/awk" |
120 |
|
else |
121 |
|
COMMAND_AWK="awk" |
122 |
|
fi |