--- trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxmanager-magellan.patch	2012/05/07 08:47:49	1765
+++ trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxmanager-magellan.patch	2012/05/07 20:52:03	1766
@@ -1,5 +1,5 @@
---- NX/scripts/setup/nxmanager.orig	2012-05-03 12:00:55.238000286 +0200
-+++ NX/scripts/setup/nxmanager	2012-05-03 12:04:00.116999553 +0200
+--- NX/scripts/setup/nxmanager.orig	2012-05-07 23:28:56.781982523 +0200
++++ NX/scripts/setup/nxmanager	2012-05-07 23:31:35.685982523 +0200
 @@ -85,6 +85,12 @@
  {
    ret_getLinuxName=0
@@ -26,7 +26,46 @@
    if [ -f /etc/debian_version ];
    then
      system=debian
-@@ -2061,6 +2073,7 @@
+@@ -179,6 +191,9 @@
+ if [ -x "/bin/unlink" ];
+ then
+   UNLINKCOMMAND="/bin/unlink"
++elif [ -x "/usr/bin/unlink" ];
++then
++  UNLINKCOMMAND="/usr/bin/unlink"
+ elif [ -x "/usr/sbin/unlink" ];
+ then
+   UNLINKCOMMAND="/usr/sbin/unlink"
+@@ -236,6 +251,9 @@
+   if [ -x "/usr/bin/awk" ];
+   then
+     AWKCOMMAND="/usr/bin/awk"
++  elif [ -x "/bin/awk" ];
++  then
++    AWKCOMMAND="/bin/awk"
+   else
+     AWKCOMMAND="awk"
+   fi
+@@ -293,7 +311,7 @@
+     SEDCOMMAND="sed"
+   fi
+ else
+-  if [ -x "/bin/grep" ];
++  if [ -x "/bin/sed" ];
+   then
+     SEDCOMMAND="/bin/sed"
+   else
+@@ -480,6 +498,9 @@
+ if [ -x "/sbin/pidof" ];
+ then
+   PIDOFCOMMAND="/sbin/pidof"
++elif [ -x "/bin/pidof" ];
++then
++  PIDOFCOMMAND="/bin/pidof"
+ else
+   PIDOFCOMMAND="pidof"
+ fi
+@@ -2061,6 +2082,7 @@
    ${ECHOCOMMAND} "                           11.04 Natty Narwhal/11.10 Oneiric Ocelot etc."
    ${ECHOCOMMAND} "       solaris      Sun Solaris 10.0 etc."
    ${ECHOCOMMAND} "       fedora       Fedora 10/11/12/13/14/15/16 etc."
@@ -34,7 +73,7 @@
  }
  
  updatePathsInFile ()
-@@ -3001,6 +3014,9 @@
+@@ -3001,6 +3023,9 @@
      elif [ "$system" = "fedora" ];
      then
        detectedSystem="Fedora"
@@ -44,7 +83,7 @@
      elif [ "$system" = "debian" ];
      then
        detectedSystem="Debian"
-@@ -3390,6 +3406,7 @@
+@@ -3390,6 +3415,7 @@
        "suse"               ) ;;
        "mandriva"           ) ;;
        "fedora"             ) ;;
@@ -52,7 +91,7 @@
        "debian"             ) ;;
        "solaris"            ) ;;
        "macosx"             ) ;;
-@@ -3530,6 +3547,7 @@
+@@ -3530,6 +3556,7 @@
  /etc/debian_version
  /etc/debian_release
  /etc/fedora-release
@@ -60,7 +99,7 @@
  /etc/gentoo-release
  /etc/immunix-release
  knoppix_version
-@@ -3559,6 +3577,7 @@
+@@ -3559,6 +3586,7 @@
  /etc/va-release
  /etc/yellowdog-release
  /etc/system-release
@@ -68,3 +107,15 @@
  )
  
  getVersionFromLSB()
+--- NX/scripts/etc/nxmanager.orig	2012-05-07 23:27:49.332982523 +0200
++++ NX/scripts/etc/nxmanager	2012-05-07 23:28:38.170982523 +0200
+@@ -19,6 +19,9 @@
+ elif [ -x /usr/bin/awk ]
+ then
+   COMMAND_AWK="/usr/bin/awk"
++elif [ -x /bin/awk ]
++then
++  COMMAND_AWK="/bin/awk"
+ else
+   COMMAND_AWK="awk"
+ fi