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