Ben Taylor : wineinstall: Use `wine --version` instead of `which wine`.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b08d5bbe62176272efeda2de3841bc02ee16e630
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b08d5bbe62176272efeda2de38...

Author: Ben Taylor 
Date:   Tue May  1 03:48:41 2007 +0000

wineinstall: Use `wine --version` instead of `which wine`.

---

tools/wineinstall |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/wineinstall b/tools/wineinstall
index 5c57f54..6602477 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -136,7 +136,8 @@ then {
   fi

# check whether wine binary still available
-  if [ -n "`which wine 2>/dev/null|grep '/wine'`" ]; then
+  if [ -n "`wine --version 2>/dev/null`" ]
+  then
     echo "Warning !! wine binary (still) found, which may indicate"
     echo "a (conflicting) previous installation."
     echo "You might want to abort and uninstall Wine first."
@@ -267,7 +268,7 @@ then {

# see if wine is installed on the users system, if not prompt them
       # and then exit
-      if [ ! `which wine` ]
+      if [ -z "`wine --version 2>/dev/null`" ]
       then
         echo "Could not find wine on your system.  Run wineinstall as root to install wine"
         echo "before re-running wineinstall as a user."