From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16010 invoked by alias); 3 Mar 2002 18:01:07 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Received: (qmail 15939 invoked from network); 3 Mar 2002 18:01:04 -0000 Received: from unknown (HELO mail1.svr.pol.co.uk) (195.92.193.18) by sources.redhat.com with SMTP; 3 Mar 2002 18:01:04 -0000 Received: from [195.92.198.123] (helo=mail17.svr.pol.co.uk) by mail1.svr.pol.co.uk with esmtp (Exim 3.35 #1) id 16haIB-0001is-00 for cygwin@cygwin.com; Sun, 03 Mar 2002 18:01:03 +0000 Received: from modem-221.ecthelion.dialup.pol.co.uk ([62.136.168.221] helo=9.140.161.66) by mail17.svr.pol.co.uk with smtp (Exim 3.35 #1) id 16haI8-0007Wa-00 for cygwin@cygwin.com; Sun, 03 Mar 2002 18:01:00 +0000 Received: FROM ukf.net BY 9.140.161.66 ; Sun, 3 Mar 2002 17:59:52 +00:00 Message-ID: <002101c1c2dd$36f06650$dda8883e@wdg.uk.ibm.com> From: "Max Bowsher" To: Subject: setup.exe (cinstall) bugfixes + minor new feature Date: Sun, 03 Mar 2002 10:01:00 -0000 MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=SHA1; boundary="----=_NextPart_000_001A_01C1C2DC.65A72110" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 X-SW-Source: 2002-03/txt/msg00132.txt.bz2 ------=_NextPart_000_001A_01C1C2DC.65A72110 Content-Type: multipart/mixed; boundary="----=_NextPart_001_001B_01C1C2DC.65A72110" ------=_NextPart_001_001B_01C1C2DC.65A72110 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-length: 950 I've been working with the setup code, and have discovered some bugs in the current (just updated) CVS version. I'm posting a patch here for comments, whilst I join cygwin-patches, and study the Contributing instructions. The patch does the following: BugFix: io_stream::mkpath_p(isadir, path) misuse mkpath_p is supposed to take a path with either a file:// or a cygfile:// prefix, but it is fed a path with no prefix in some places. The patch adds a file:// prefix where needed. This was causing some directories not to be created, including the Cygwin directory in the start menu. BugFix: add backslash call to make_link, in desktop.cc This was causing the start menu shortcut to be called 'Programs/Cygwin/Cygwin Bash Shell' instead of being in the correct directory structure Feature Addition: Use files /etc/setup/inhibit-{startmenu,desktop}-icon to remeber user de-selection of the create icon checkboxes on the last page of setup. Max. ------=_NextPart_001_001B_01C1C2DC.65A72110 Content-Type: application/octet-stream; name="currwork.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="currwork.patch" Content-length: 3125 diff -mru -X patch-excludes src/winsup/cinstall/desktop.cc src-work/winsup/= cinstall/desktop.cc=0A= --- src/winsup/cinstall/desktop.cc Sun Mar 3 17:29:24 2002=0A= +++ src-work/winsup/cinstall/desktop.cc Sun Mar 3 17:23:41 2002=0A= @@ -103,7 +103,7 @@=0A= static void=0A= make_link (String const &linkpath, String const &title, String const &targ= et)=0A= {=0A= - String fname =3D linkpath + "/" + title + ".lnk";=0A= + String fname =3D backslash(linkpath + "/" + title + ".lnk");=0A= =20=0A= if (_access (fname.cstr_oneuse(), 0) =3D=3D 0)=0A= return; /* already exists */=0A= @@ -111,7 +111,7 @@=0A= msg ("make_link %s, %s, %s\n",=0A= fname.cstr_oneuse(), title.cstr_oneuse(), target.cstr_oneuse());=0A= =20=0A= - io_stream::mkpath_p (PATH_TO_FILE, fname);=0A= + io_stream::mkpath_p (PATH_TO_FILE, String("file://") + fname);=0A= =20=0A= String exepath;=0A= =20=0A= @@ -278,7 +278,7 @@=0A= make_passwd_group ()=0A= {=0A= String fname =3D cygpath ("/etc/postinstall/passwd-grp.bat");=0A= - io_stream::mkpath_p (PATH_TO_FILE, fname);=0A= + io_stream::mkpath_p (PATH_TO_FILE, String("file://") + fname);=0A= =20=0A= if (uexists ("/etc/passwd") && uexists ("/etc/group"))=0A= return;=0A= @@ -339,14 +339,27 @@=0A= make_etc_profile ();=0A= make_passwd_group ();=0A= =20=0A= + String inhibit_menu_file =3D backslash(cygpath("/etc/setup/inhibit-start= menu-icon"));=0A= + String inhibit_desktop_file =3D backslash(cygpath("/etc/setup/inhibit-de= sktop-icon"));=0A= +=0A= if (root_menu)=0A= {=0A= start_menu ("Cygwin Bash Shell", batname);=0A= + _unlink(inhibit_menu_file.cstr_oneuse());=0A= + }=0A= + else=0A= + {=0A= + fclose(fopen(inhibit_menu_file.cstr_oneuse(),"wb"));=0A= }=0A= =20=0A= if (root_desktop)=0A= {=0A= desktop_icon ("Cygwin", batname);=0A= + _unlink(inhibit_desktop_file.cstr_oneuse());=0A= + }=0A= + else=0A= + {=0A= + fclose(fopen(inhibit_desktop_file.cstr_oneuse(),"wb"));=0A= }=0A= }=0A= =20=0A= @@ -397,6 +410,9 @@=0A= if (_access (fname.cstr_oneuse(), 0) =3D=3D 0)=0A= return 0; /* already exists */=0A= =20=0A= + if (uexists("/etc/setup/inhibit-desktop-icon"))=0A= + return 0; /* inhibited by previous user choice */=0A= +=0A= return IDC_ROOT_DESKTOP;=0A= }=0A= =20=0A= @@ -430,6 +446,9 @@=0A= =20=0A= if (_access (fname.cstr_oneuse(), 0) =3D=3D 0)=0A= return 0; /* already exists */=0A= +=0A= + if (uexists("/etc/setup/inhibit-startmenu-icon"))=0A= + return 0; /* inhibited by previous user choice */=0A= =20=0A= return IDC_ROOT_MENU;=0A= }=0A= diff -mru -X patch-excludes src/winsup/cinstall/localdir.cc src-work/winsup= /cinstall/localdir.cc=0A= --- src/winsup/cinstall/localdir.cc Mon Feb 18 13:53:06 2002=0A= +++ src-work/winsup/cinstall/localdir.cc Sun Mar 3 17:20:34 2002=0A= @@ -45,7 +45,7 @@=0A= void=0A= save_local_dir ()=0A= {=0A= - io_stream::mkpath_p (PATH_TO_DIR, local_dir);=0A= + io_stream::mkpath_p (PATH_TO_DIR, String("file://") + local_dir);=0A= =20=0A= io_stream *f;=0A= if (get_root_dir ().size())=0A= ------=_NextPart_001_001B_01C1C2DC.65A72110-- ------=_NextPart_000_001A_01C1C2DC.65A72110 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-length: 3644 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 ------=_NextPart_000_001A_01C1C2DC.65A72110--