Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxclient-magellan.patch
Parent Directory | Revision Log
Revision 1766 -
(hide annotations)
(download)
Mon May 7 20:52:03 2012 UTC (12 years, 4 months ago) by niro
File size: 2285 byte(s)
Mon May 7 20:52:03 2012 UTC (12 years, 4 months ago) by niro
File size: 2285 byte(s)
-fixed patches
1 | niro | 1766 | --- NX/scripts/setup/nxclient.orig 2012-05-07 23:19:21.137982523 +0200 |
2 | +++ NX/scripts/setup/nxclient 2012-05-07 23:26:11.913982523 +0200 | ||
3 | niro | 1764 | @@ -85,6 +85,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 | @@ -109,6 +116,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 | niro | 1766 | @@ -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 | @@ -293,7 +309,7 @@ | ||
41 | SEDCOMMAND="sed" | ||
42 | fi | ||
43 | else | ||
44 | - if [ -x "/bin/grep" ]; | ||
45 | + if [ -x "/bin/sed" ]; | ||
46 | then | ||
47 | SEDCOMMAND="/bin/sed" | ||
48 | else | ||
49 | @@ -480,6 +496,9 @@ | ||
50 | if [ -x "/sbin/pidof" ]; | ||
51 | then | ||
52 | PIDOFCOMMAND="/sbin/pidof" | ||
53 | +elif [ -x "/bin/pidof" ]; | ||
54 | +then | ||
55 | + PIDOFCOMMAND="/bin/pidof" | ||
56 | else | ||
57 | PIDOFCOMMAND="pidof" | ||
58 | fi | ||
59 | @@ -2061,6 +2080,7 @@ | ||
60 | niro | 1764 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
61 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." | ||
62 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." | ||
63 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." | ||
64 | } | ||
65 | |||
66 | updatePathsInFile () | ||
67 | niro | 1766 | @@ -3001,6 +3021,9 @@ |
68 | niro | 1764 | elif [ "$system" = "fedora" ]; |
69 | then | ||
70 | detectedSystem="Fedora" | ||
71 | + elif [ "$system" = "magellan" ]; | ||
72 | + then | ||
73 | + detectedSystem="Magellan-Linux" | ||
74 | elif [ "$system" = "debian" ]; | ||
75 | then | ||
76 | detectedSystem="Debian" | ||
77 | niro | 1766 | @@ -3390,6 +3413,7 @@ |
78 | niro | 1764 | "suse" ) ;; |
79 | "mandriva" ) ;; | ||
80 | "fedora" ) ;; | ||
81 | + "magellan" ) ;; | ||
82 | "debian" ) ;; | ||
83 | "solaris" ) ;; | ||
84 | "macosx" ) ;; | ||
85 | niro | 1766 | @@ -3530,6 +3554,7 @@ |
86 | niro | 1764 | /etc/debian_version |
87 | /etc/debian_release | ||
88 | /etc/fedora-release | ||
89 | +/etc/mageversion | ||
90 | /etc/gentoo-release | ||
91 | /etc/immunix-release | ||
92 | knoppix_version | ||
93 | niro | 1766 | @@ -3559,6 +3584,7 @@ |
94 | niro | 1764 | /etc/va-release |
95 | /etc/yellowdog-release | ||
96 | /etc/system-release | ||
97 | +/etc/os-release | ||
98 | ) | ||
99 | |||
100 | getVersionFromLSB() |