Magellan Linux

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

    Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxmanager-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1766 - (hide annotations) (download)
    Mon May 7 20:52:03 2012 UTC (12 years ago) by niro
    File size: 2750 byte(s) 
    -fixed patches
    1 niro 1766 --- NX/scripts/setup/nxmanager.orig 2012-05-07 23:28:56.781982523 +0200
    2     +++ NX/scripts/setup/nxmanager 2012-05-07 23:31:35.685982523 +0200
    3 niro 1764 @@ -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 niro 1766 @@ -179,6 +191,9 @@
    30     if [ -x "/bin/unlink" ];
    31     then
    32     UNLINKCOMMAND="/bin/unlink"
    33     +elif [ -x "/usr/bin/unlink" ];
    34     +then
    35     + UNLINKCOMMAND="/usr/bin/unlink"
    36     elif [ -x "/usr/sbin/unlink" ];
    37     then
    38     UNLINKCOMMAND="/usr/sbin/unlink"
    39     @@ -236,6 +251,9 @@
    40     if [ -x "/usr/bin/awk" ];
    41     then
    42     AWKCOMMAND="/usr/bin/awk"
    43     + elif [ -x "/bin/awk" ];
    44     + then
    45     + AWKCOMMAND="/bin/awk"
    46     else
    47     AWKCOMMAND="awk"
    48     fi
    49     @@ -293,7 +311,7 @@
    50     SEDCOMMAND="sed"
    51     fi
    52     else
    53     - if [ -x "/bin/grep" ];
    54     + if [ -x "/bin/sed" ];
    55     then
    56     SEDCOMMAND="/bin/sed"
    57     else
    58     @@ -480,6 +498,9 @@
    59     if [ -x "/sbin/pidof" ];
    60     then
    61     PIDOFCOMMAND="/sbin/pidof"
    62     +elif [ -x "/bin/pidof" ];
    63     +then
    64     + PIDOFCOMMAND="/bin/pidof"
    65     else
    66     PIDOFCOMMAND="pidof"
    67     fi
    68     @@ -2061,6 +2082,7 @@
    69 niro 1764 ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc."
    70     ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc."
    71     ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc."
    72     + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc."
    73     }
    74    
    75     updatePathsInFile ()
    76 niro 1766 @@ -3001,6 +3023,9 @@
    77 niro 1764 elif [ "$system" = "fedora" ];
    78     then
    79     detectedSystem="Fedora"
    80     + elif [ "$system" = "magellan" ];
    81     + then
    82     + detectedSystem="Magellan-Linux"
    83     elif [ "$system" = "debian" ];
    84     then
    85     detectedSystem="Debian"
    86 niro 1766 @@ -3390,6 +3415,7 @@
    87 niro 1764 "suse" ) ;;
    88     "mandriva" ) ;;
    89     "fedora" ) ;;
    90     + "magellan" ) ;;
    91     "debian" ) ;;
    92     "solaris" ) ;;
    93     "macosx" ) ;;
    94 niro 1766 @@ -3530,6 +3556,7 @@
    95 niro 1764 /etc/debian_version
    96     /etc/debian_release
    97     /etc/fedora-release
    98     +/etc/mageversion
    99     /etc/gentoo-release
    100     /etc/immunix-release
    101     knoppix_version
    102 niro 1766 @@ -3559,6 +3586,7 @@
    103 niro 1764 /etc/va-release
    104     /etc/yellowdog-release
    105     /etc/system-release
    106     +/etc/os-release
    107     )
    108    
    109     getVersionFromLSB()
    110 niro 1766 --- NX/scripts/etc/nxmanager.orig 2012-05-07 23:27:49.332982523 +0200
    111     +++ NX/scripts/etc/nxmanager 2012-05-07 23:28:38.170982523 +0200
    112     @@ -19,6 +19,9 @@
    113     elif [ -x /usr/bin/awk ]
    114     then
    115     COMMAND_AWK="/usr/bin/awk"
    116     +elif [ -x /bin/awk ]
    117     +then
    118     + COMMAND_AWK="/bin/awk"
    119     else
    120     COMMAND_AWK="awk"
    121     fi