[Wine-patches] Fix a problem with wine --admin if it is run without a license (eterbug #4996).

Alexander Morozov amorozov на etersoft.ru
Пт Фев 5 20:31:15 MSK 2010


----------- следующая часть -----------
From c5765814b77b32a5c81ee3f3b8f2f52c2df020ca Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Fri, 5 Feb 2010 20:25:28 +0300
Subject: [PATCH] Fix a problem with wine --admin if it is run without a license (eterbug #4996).

---
 etersoft/scripts/wine.in |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/etersoft/scripts/wine.in b/etersoft/scripts/wine.in
index 3d2a0eb..eee5e1a 100644
--- a/etersoft/scripts/wine.in
+++ b/etersoft/scripts/wine.in
@@ -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
-- 
1.6.5.8



Подробная информация о списке рассылки Wine-patches