--- trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch	2012/05/07 08:47:49	1765
+++ trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxwebplayer-magellan.patch	2012/05/07 20:52:03	1766
@@ -1,5 +1,5 @@
---- NX/scripts/setup/nxwebplayer.orig	2012-05-03 13:02:35.860995683 +0200
-+++ NX/scripts/setup/nxwebplayer	2012-05-03 13:05:06.314993623 +0200
+--- NX/scripts/setup/nxwebplayer.orig	2012-05-07 23:45:55.981982523 +0200
++++ NX/scripts/setup/nxwebplayer	2012-05-07 23:47:10.230982523 +0200
 @@ -86,6 +86,13 @@
  {
    ret_getLinuxName=0
@@ -27,7 +27,46 @@
    if [ -f /etc/debian_version ];
    then
      system=debian
-@@ -2062,6 +2075,7 @@
+@@ -180,6 +193,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"
+@@ -237,6 +253,9 @@
+   if [ -x "/usr/bin/awk" ];
+   then
+     AWKCOMMAND="/usr/bin/awk"
++  elif [ -x "/bin/awk" ];
++  then
++    AWKCOMMAND="/bin/awk"
+   else
+     AWKCOMMAND="awk"
+   fi
+@@ -294,7 +313,7 @@
+     SEDCOMMAND="sed"
+   fi
+ else
+-  if [ -x "/bin/grep" ];
++  if [ -x "/bin/sed" ];
+   then
+     SEDCOMMAND="/bin/sed"
+   else
+@@ -481,6 +500,9 @@
+ if [ -x "/sbin/pidof" ];
+ then
+   PIDOFCOMMAND="/sbin/pidof"
++elif [ -x "/bin/pidof" ];
++then
++  PIDOFCOMMAND="/bin/pidof"
+ else
+   PIDOFCOMMAND="pidof"
+ fi
+@@ -2062,6 +2084,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."
@@ -35,7 +74,7 @@
  }
  
  updatePathsInFile ()
-@@ -3002,6 +3016,9 @@
+@@ -3002,6 +3025,9 @@
      elif [ "$system" = "fedora" ];
      then
        detectedSystem="Fedora"
@@ -45,7 +84,7 @@
      elif [ "$system" = "debian" ];
      then
        detectedSystem="Debian"
-@@ -3391,6 +3408,7 @@
+@@ -3391,6 +3417,7 @@
        "suse"               ) ;;
        "mandriva"           ) ;;
        "fedora"             ) ;;
@@ -53,7 +92,7 @@
        "debian"             ) ;;
        "solaris"            ) ;;
        "macosx"             ) ;;
-@@ -3531,6 +3549,7 @@
+@@ -3531,6 +3558,7 @@
  /etc/debian_version
  /etc/debian_release
  /etc/fedora-release
@@ -61,7 +100,7 @@
  /etc/gentoo-release
  /etc/immunix-release
  knoppix_version
-@@ -3560,6 +3579,7 @@
+@@ -3560,6 +3588,7 @@
  /etc/va-release
  /etc/yellowdog-release
  /etc/system-release
@@ -69,3 +108,15 @@
  )
  
  getVersionFromLSB()
+--- NX/scripts/etc/nxwebplayer.orig	2012-05-07 23:45:49.040982523 +0200
++++ NX/scripts/etc/nxwebplayer	2012-05-07 23:47:32.261982523 +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