/[pkg-src]/trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch |
Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch
Parent Directory | Revision Log
Revision 1764 -
(hide annotations)
(download)
Thu May 3 13:12:06 2012 UTC (12 years, 4 months ago) by niro
File size: 1734 byte(s)
Thu May 3 13:12:06 2012 UTC (12 years, 4 months ago) by niro
File size: 1734 byte(s)
-added patches and files for nx 4.0.181
1 | niro | 1764 | --- NX/scripts/setup/nxwebplayer.orig 2012-05-03 13:02:35.860995683 +0200 |
2 | +++ NX/scripts/setup/nxwebplayer 2012-05-03 13:05:06.314993623 +0200 | ||
3 | @@ -86,6 +86,13 @@ | ||
4 | { | ||
5 | ret_getLinuxName=0 | ||
6 | |||
7 | + # prefer os-release | ||
8 | + if [ -f /etc/os-release ]; | ||
9 | + then | ||
10 | + system=$(source /etc/os-release; echo "${ID}") | ||
11 | + return 0 | ||
12 | + fi | ||
13 | + | ||
14 | if [ -f /etc/SuSE-release ]; | ||
15 | then | ||
16 | system=suse | ||
17 | @@ -110,6 +117,12 @@ | ||
18 | return 0 | ||
19 | fi | ||
20 | |||
21 | + if [ -f /etc/mageversion ]; | ||
22 | + then | ||
23 | + system=magellan | ||
24 | + return 0 | ||
25 | + fi | ||
26 | + | ||
27 | if [ -f /etc/debian_version ]; | ||
28 | then | ||
29 | system=debian | ||
30 | @@ -2062,6 +2075,7 @@ | ||
31 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." | ||
32 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." | ||
33 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." | ||
34 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." | ||
35 | } | ||
36 | |||
37 | updatePathsInFile () | ||
38 | @@ -3002,6 +3016,9 @@ | ||
39 | elif [ "$system" = "fedora" ]; | ||
40 | then | ||
41 | detectedSystem="Fedora" | ||
42 | + elif [ "$system" = "magellan" ]; | ||
43 | + then | ||
44 | + detectedSystem="Magellan-Linux" | ||
45 | elif [ "$system" = "debian" ]; | ||
46 | then | ||
47 | detectedSystem="Debian" | ||
48 | @@ -3391,6 +3408,7 @@ | ||
49 | "suse" ) ;; | ||
50 | "mandriva" ) ;; | ||
51 | "fedora" ) ;; | ||
52 | + "magellan" ) ;; | ||
53 | "debian" ) ;; | ||
54 | "solaris" ) ;; | ||
55 | "macosx" ) ;; | ||
56 | @@ -3531,6 +3549,7 @@ | ||
57 | /etc/debian_version | ||
58 | /etc/debian_release | ||
59 | /etc/fedora-release | ||
60 | +/etc/mageversion | ||
61 | /etc/gentoo-release | ||
62 | /etc/immunix-release | ||
63 | knoppix_version | ||
64 | @@ -3560,6 +3579,7 @@ | ||
65 | /etc/va-release | ||
66 | /etc/yellowdog-release | ||
67 | /etc/system-release | ||
68 | +/etc/os-release | ||
69 | ) | ||
70 | |||
71 | getVersionFromLSB() |