X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=-1.8 required=5.0 tests=AWL,BAYES_00
X-Spam-Check-By:	sourceware.org
Message-ID:	<4B3A05CE.1050003@t-online.de>
Date:	Tue, 29 Dec 2009 14:36:14 +0100
From:	Christian Franke <Christian DOT Franke AT t-online DOT de>
User-Agent:	Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.4) Gecko/20091017 SeaMonkey/2.0
MIME-Version:	1.0
To:	cygwin AT cygwin DOT com
Subject:	[Patch] chere-1.1-1: fix uninstall from Control Panel
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

--------------030603060308040903010908
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Uninstalling a chere item from Control Panel does not work if 
C:\cygwin\bin is not in Windows default PATH.
The attached patch fixes this.

Christian


--------------030603060308040903010908
Content-Type: text/x-diff;
 name="chere-uninstall.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="chere-uninstall.patch"

--- chere-1.1-1	2009-01-29 23:15:52.001000000 +0100
+++ chere	2009-12-29 14:09:58.046875000 +0100
@@ -707,7 +707,7 @@ create_uninstall_item()
   # even after the cygwin directory is wiped :(
   if $REGTOOL add $1 ; then
    $REGTOOL -s set $1/DisplayName \"$CPH_DESC\"
-   $REGTOOL -s set $1/UnInstallString \"$ASH_EXE -c \\\"/bin/chere $UINST_ARG -u -s $2\\\"\"
+   $REGTOOL -s set $1/UnInstallString \"$ASH_EXE -c \\\"PATH=/bin /bin/chere $UINST_ARG -u -s $2\\\"\"
   else
    echo $0 Error: Couldn\'t modify HKLM hive.
    echo Control Panel uninstall will not be available.


--------------030603060308040903010908
Content-Type: text/plain; charset=us-ascii

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
--------------030603060308040903010908--

- Raw text -