Commit b08d5bbe authored by Ben Taylor's avatar Ben Taylor Committed by Alexandre Julliard

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

parent b39381f4
...@@ -136,7 +136,8 @@ then { ...@@ -136,7 +136,8 @@ then {
fi fi
# check whether wine binary still available # 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 "Warning !! wine binary (still) found, which may indicate"
echo "a (conflicting) previous installation." echo "a (conflicting) previous installation."
echo "You might want to abort and uninstall Wine first." echo "You might want to abort and uninstall Wine first."
...@@ -267,7 +268,7 @@ then { ...@@ -267,7 +268,7 @@ then {
# see if wine is installed on the users system, if not prompt them # see if wine is installed on the users system, if not prompt them
# and then exit # and then exit
if [ ! `which wine` ] if [ -z "`wine --version 2>/dev/null`" ]
then then
echo "Could not find wine on your system. Run wineinstall as root to install wine" echo "Could not find wine on your system. Run wineinstall as root to install wine"
echo "before re-running wineinstall as a user." echo "before re-running wineinstall as a user."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment