Fix a problem with wine --admin if it is run without a license (eterbug #4996).
authorAlexander Morozov <amorozov@etersoft.ru>
Fri, 5 Feb 2010 17:25:28 +0000 (20:25 +0300)
committerDenis Baranov <baraka@etersoft.ru>
Wed, 17 Feb 2010 12:15:36 +0000 (15:15 +0300)
etersoft/scripts/wine.in

index 3d2a0eba4379262e1c8066d7d697cd22a03137db..eee5e1ab9d7384e25fd171b30141346c115e272d 100644 (file)
@@ -395,7 +395,7 @@ else
        update_wine $@
 
        echo "`${WINELOADER} --version 2>/dev/null` has been configured for the first time."
-       if [ -z "$1" ] ; then
+       if [ -z "$1" ] || [ "$1" = "--admin" ] || [ "$1" = "--attach" ] ; then
                echo "Use ${HOME}/wine_c as WINE C:\\ disk."
                echo "Copy your program into and install it."
                echo
@@ -445,10 +445,6 @@ if [ "$1" = "--removeprinters" ] ; then
        exit 0
 fi
 
-if [ "$1" = "--admin" ] || [ "$1" = "--attach" ] ; then
-        exit 0
-fi
-
 if [ "$1" = "--workdir" ] ; then
        WINEWORKDIRPATH=$($WINELOADER winepath "$2")
        shift 2