Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch

    Contents of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1766 - (show annotations) (download)
    Mon May 7 20:52:03 2012 UTC (12 years ago) by niro
    File size: 2781 byte(s) 
    -fixed patches
    1 --- NX/scripts/setup/nxwebplayer.orig 2012-05-07 23:45:55.981982523 +0200
    2 +++ NX/scripts/setup/nxwebplayer 2012-05-07 23:47:10.230982523 +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 @@ -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."
    71 ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc."
    72 ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc."
    73 + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc."
    74 }
    75
    76 updatePathsInFile ()
    77 @@ -3002,6 +3025,9 @@
    78 elif [ "$system" = "fedora" ];
    79 then
    80 detectedSystem="Fedora"
    81 + elif [ "$system" = "magellan" ];
    82 + then
    83 + detectedSystem="Magellan-Linux"
    84 elif [ "$system" = "debian" ];
    85 then
    86 detectedSystem="Debian"
    87 @@ -3391,6 +3417,7 @@
    88 "suse" ) ;;
    89 "mandriva" ) ;;
    90 "fedora" ) ;;
    91 + "magellan" ) ;;
    92 "debian" ) ;;
    93 "solaris" ) ;;
    94 "macosx" ) ;;
    95 @@ -3531,6 +3558,7 @@
    96 /etc/debian_version
    97 /etc/debian_release
    98 /etc/fedora-release
    99 +/etc/mageversion
    100 /etc/gentoo-release
    101 /etc/immunix-release
    102 knoppix_version
    103 @@ -3560,6 +3588,7 @@
    104 /etc/va-release
    105 /etc/yellowdog-release
    106 /etc/system-release
    107 +/etc/os-release
    108 )
    109
    110 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