RE: setup.exe (cinstall) bugfixes + minor new feature

RE: setup.exe (cinstall) bugfixes + minor new feature

[Robert Collins]

> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net] 
> Sent: Monday, March 04, 2002 9:08 PM
> To: cygwin@cygwin.com
> Subject: Re: setup.exe (cinstall) bugfixes + minor new feature
> 
> 
> I did notice that setup-20020225.exe does not have the 
> shortcut creation bug - do you have some fixes which haven't 
> made it to CVS yet?
> 
> Re Feature Addition - is the objection that you don't want to 
> set a precedent for lots of placeholder files in /etc/setup ? 
> This I can understand, but I don't see what 'it will only 
> remember turning them off' means - what else should it remember?

I was thinking that 
If the setting is absent it prompts,
if the setting is on it always creates, overwriting the current one
if the setting is off it never creates.

Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: setup.exe (cinstall) bugfixes + minor new feature

[Max Bowsher]

> I was thinking that
> If the setting is absent it prompts,
> if the setting is on it always creates, overwriting the current one
> if the setting is off it never creates.

> Rob

Hmm - I'm not sure I understand this.

Current behaviour is that setup checks the boxes by default, if it does not
find the shortcuts.
The user can manually check the boxes to run the creation code even if they
already exist.
I find it mildly annoying to have to uncheck both boxes each time I run
setup. (My desktop shortcut is called something different, and I don't want
a start menu one)
Therefore, I would like setup to remember the fact that the user has
deliberately unchecked the boxes.
I don't understand why anyone would want the shortcuts deleted and recreated
every time the run setup?

I have just realised that there was a bug in my previous implementation -
setup will need to distinguish between it detecting the presence of the
shortcuts, and so defaulting the checkboxes to off, and a user turning them
off. (i.e., a user should be able to run setup, and it creates shortcuts,
run setup again, and the boxes be unchecked, delete the shortcuts, and have
setup check the boxes by default again - so only not checking by default
when the user has deliberately turned the checkboxes off)

I will proceed with fixing that bug, and investigate the use of a setup.conf
file. Are there any objections to using windows {Get,Set}PrivateProfileInt
API calls? Or should I investigate the setup.ini parsing code, and try to
use that?


Thanks,

Max.

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/




--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: setup.exe (cinstall) bugfixes + minor new feature

[Robert Collins]

> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net] 
> 
> But the user will need to run setup.exe and follow it through 
> all the way anyway. If they've managed to get through package 
> selection, does forcing the choice of shortcut creation help? 
> Or do you have big things planned for setup (full unattended 
> setup from an answer file?)?.

Yes.
 
> 
> If this is going to be interim only, do you mind if I stick 
> with my inhibit-?-icon files?

And yes.

The point being that the persistence logic may change, but the trinary
decision logic shouldn't.

Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: setup.exe (cinstall) bugfixes + minor new feature

[Max Bowsher]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

>> Therefore, I would like setup to remember the fact that the
>> user has deliberately unchecked the boxes. I don't understand
>> why anyone would want the shortcuts deleted and recreated
>> every time the run setup?
>
> I can think of reasons :}. The first one being that as a sysadmin I
> might want to force every user to get shortcuts - without being
> prompted. Now a shared cygwin install does not imply shared profiles -
> desktop and start menu locations - so the ability to turn off the prompt
> and always create is thus useful.

But the user will need to run setup.exe and follow it through all the way
anyway. If they've managed to get through package selection, does forcing
the choice of shortcut creation help? Or do you have big things planned for
setup (full unattended setup from an answer file?)?.

> I will proceed with fixing that bug, and investigate the use
> of a setup.conf file. Are there any objections to using
> windows {Get,Set}PrivateProfileInt API calls? Or should I
> investigate the setup.ini parsing code, and try to use that?

> Neither :}. I've a model in mind for persistence for all the currently
> diverse setup options. Seriously though, for now, code it with
> Get|Set... And I'll get my model documented and into code at some point.

If this is going to be interim only, do you mind if I stick with my
inhibit-?-icon files?

> Rob

Max.

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2688 bytes --]

RE: setup.exe (cinstall) bugfixes + minor new feature

[Robert Collins]

> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net] 
> 
> 
> > I was thinking that
> > If the setting is absent it prompts,
> > if the setting is on it always creates, overwriting the 
> current one if 
> > the setting is off it never creates.
> 
> > Rob
> 
> Hmm - I'm not sure I understand this.
> 
> Current behaviour is that setup checks the boxes by default, 
> if it does not find the shortcuts. The user can manually 
> check the boxes to run the creation code even if they already 
> exist. I find it mildly annoying to have to uncheck both 
> boxes each time I run setup. (My desktop shortcut is called 
> something different, and I don't want a start menu one) 
> Therefore, I would like setup to remember the fact that the 
> user has deliberately unchecked the boxes. I don't understand 
> why anyone would want the shortcuts deleted and recreated 
> every time the run setup?

I can think of reasons :}. The first one being that as a sysadmin I
might want to force every user to get shortcuts - without being
prompted. Now a shared cygwin install does not imply shared profiles -
desktop and start menu locations - so the ability to turn off the prompt
and always create is thus useful.
 
> I will proceed with fixing that bug, and investigate the use 
> of a setup.conf file. Are there any objections to using 
> windows {Get,Set}PrivateProfileInt API calls? Or should I 
> investigate the setup.ini parsing code, and try to use that?

Neither :}. I've a model in mind for persistence for all the currently
diverse setup options. Seriously though, for now, code it with
Get|Set... And I'll get my model documented and into code at some point.

Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: setup.exe (cinstall) bugfixes + minor new feature

[Max Bowsher]

Umm... weird.

the snapshot binary has no bug, yet the one I compiled from current CVS
does. Can I have broken my build environment that badly?
Here's what I do

update from cvs
run this script <<EOS
#!/usr/bin/bash

echo Generating changes...
diff -mru -X patch-excludes src/ src-work/ 1>prevwork.patch
echo Removing src-work...
rm -rf src-work
echo Copying out src-work...
# non-recursive
mkdir src-work
cp src/* src-work
cp -r src/winsup src-work

echo Patching src-work...
cd src-work
patch -p1 -i ../committed.patch

[ "$1" == "c" ] && patch -p1 -i ../currwork.patch
[ "$1" == "p" ] && patch -p1 -i ../prevwork.patch

echo Tweaking...
mv winsup/bz2lib/Makefile winsup/bz2lib/Makefile-from-CVS
cp ../do-build.sh winsup

echo Done!
EOS

run ./configure, then make, in w32api, then bz2lib, then cinstall


Max.


----- Original Message -----
From: "Robert Collins" <robert.collins@itdomain.com.au>
To: "Max Bowsher" <maxb@ukf.net>; <cygwin@cygwin.com>
Sent: Monday, March 04, 2002 10:34 AM
Subject: RE: setup.exe (cinstall) bugfixes + minor new feature




> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net]
> Sent: Monday, March 04, 2002 9:08 PM
> To: cygwin@cygwin.com
> Subject: Re: setup.exe (cinstall) bugfixes + minor new feature
>
>
> I did notice that setup-20020225.exe does not have the
> shortcut creation bug - do you have some fixes which haven't
> made it to CVS yet?

No, its all checked in.

Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/




--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: setup.exe (cinstall) bugfixes + minor new feature

[Robert Collins]

> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net] 
> Sent: Monday, March 04, 2002 9:08 PM
> To: cygwin@cygwin.com
> Subject: Re: setup.exe (cinstall) bugfixes + minor new feature
> 
> 
> I did notice that setup-20020225.exe does not have the 
> shortcut creation bug - do you have some fixes which haven't 
> made it to CVS yet?

No, its all checked in.

Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: setup.exe (cinstall) bugfixes + minor new feature

[Max Bowsher]

[-- Attachment #1: Type: text/plain, Size: 2762 bytes --]

I did notice that setup-20020225.exe does not have the shortcut creation
bug - do you have some fixes which haven't made it to CVS yet?

Re Feature Addition - is the objection that you don't want to set a
precedent for lots of placeholder files in /etc/setup ? This I can
understand, but I don't see what 'it will only remember turning them off'
means - what else should it remember?
 
 
Max.
 
----- Original Message -----
From: "Robert Collins" <robert.collins@itdomain.com.au>
To: "Max Bowsher" <maxb@ukf.net>; <cygwin@cygwin.com>
Sent: Sunday, March 03, 2002 9:15 PM
Subject: RE: setup.exe (cinstall) bugfixes + minor new feature
> 
> 
> Thanks Max.
> 
> > -----Original Message-----
> > From: Max Bowsher [mailto:maxb@ukf.net]
> > Sent: Monday, March 04, 2002 4:54 AM
> > To: cygwin@cygwin.com
> > Subject: setup.exe (cinstall) bugfixes + minor new feature
> >
> >
> > 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.
> 
> I know about these - they are fixed in setup200202 - when that goes live
> I'll be backporting some key bugs.
> 
> > 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
> 
> Does this affect setup200202? I haven't checked yet. I'm trying to
> encpasulate the path specific knowledge - so whilst this solution works,
> I'd rather refactor make_link to leverage io_stream, and make this a
> method or variant of the file:// io_stream. Also '/' separated paths are
> valid to pass to the WIN32 API, so I'm curious why this is suddenly
> become a problem. (Quite a lot of setup expects '/' separated paths, and
> I see no reason to change that at this point.
> 
> > 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.
> 
> This approach is too simple - it will only remember turning them off.
> The settings should go in /etc/setup/setup.conf as something like
> "desktop_icon = yes|no".
> 
> Thanks for the patch though, I look forward to an update.
> 
> Cheers,
> Rob
> 
> 
> 


[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2688 bytes --]

RE: setup.exe (cinstall) bugfixes + minor new feature

[Robert Collins]

Thanks Max.

> -----Original Message-----
> From: Max Bowsher [mailto:maxb@ukf.net] 
> Sent: Monday, March 04, 2002 4:54 AM
> To: cygwin@cygwin.com
> Subject: setup.exe (cinstall) bugfixes + minor new feature
> 
> 
> 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.

I know about these - they are fixed in setup200202 - when that goes live
I'll be backporting some key bugs. 
 
> 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

Does this affect setup200202? I haven't checked yet. I'm trying to
encpasulate the path specific knowledge - so whilst this solution works,
I'd rather refactor make_link to leverage io_stream, and make this a
method or variant of the file:// io_stream. Also '/' separated paths are
valid to pass to the WIN32 API, so I'm curious why this is suddenly
become a problem. (Quite a lot of setup expects '/' separated paths, and
I see no reason to change that at this point.
 
> 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.

This approach is too simple - it will only remember turning them off.
The settings should go in /etc/setup/setup.conf as something like
"desktop_icon = yes|no". 

Thanks for the patch though, I look forward to an update.

Cheers,
Rob

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

setup.exe (cinstall) bugfixes + minor new feature

[Max Bowsher]

[-- Attachment #1.1: Type: text/plain, Size: 950 bytes --]

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.

[-- Attachment #1.2: currwork.patch --]
[-- Type: application/octet-stream, Size: 2797 bytes --]

diff -mru -X patch-excludes src/winsup/cinstall/desktop.cc src-work/winsup/cinstall/desktop.cc
--- src/winsup/cinstall/desktop.cc	Sun Mar  3 17:29:24 2002
+++ src-work/winsup/cinstall/desktop.cc	Sun Mar  3 17:23:41 2002
@@ -103,7 +103,7 @@
 static void
 make_link (String const &linkpath, String const &title, String const &target)
 {
-  String fname = linkpath + "/" + title + ".lnk";
+  String fname = backslash(linkpath + "/" + title + ".lnk");
 
   if (_access (fname.cstr_oneuse(), 0) == 0)
     return;			/* already exists */
@@ -111,7 +111,7 @@
   msg ("make_link %s, %s, %s\n",
        fname.cstr_oneuse(), title.cstr_oneuse(), target.cstr_oneuse());
 
-  io_stream::mkpath_p (PATH_TO_FILE, fname);
+  io_stream::mkpath_p (PATH_TO_FILE, String("file://") + fname);
 
   String exepath;
 
@@ -278,7 +278,7 @@
 make_passwd_group ()
 {
   String fname = cygpath ("/etc/postinstall/passwd-grp.bat");
-  io_stream::mkpath_p (PATH_TO_FILE, fname);
+  io_stream::mkpath_p (PATH_TO_FILE, String("file://") + fname);
 
   if (uexists ("/etc/passwd") && uexists ("/etc/group"))
     return;
@@ -339,14 +339,27 @@
   make_etc_profile ();
   make_passwd_group ();
 
+  String inhibit_menu_file = backslash(cygpath("/etc/setup/inhibit-startmenu-icon"));
+  String inhibit_desktop_file = backslash(cygpath("/etc/setup/inhibit-desktop-icon"));
+
   if (root_menu)
     {
       start_menu ("Cygwin Bash Shell", batname);
+      _unlink(inhibit_menu_file.cstr_oneuse());
+    }
+  else
+    {
+      fclose(fopen(inhibit_menu_file.cstr_oneuse(),"wb"));
     }
 
   if (root_desktop)
     {
       desktop_icon ("Cygwin", batname);
+      _unlink(inhibit_desktop_file.cstr_oneuse());
+    }
+  else
+    {
+      fclose(fopen(inhibit_desktop_file.cstr_oneuse(),"wb"));
     }
 }
 
@@ -397,6 +410,9 @@
   if (_access (fname.cstr_oneuse(), 0) == 0)
     return 0;			/* already exists */
 
+  if (uexists("/etc/setup/inhibit-desktop-icon"))
+    return 0;			/* inhibited by previous user choice */
+
   return IDC_ROOT_DESKTOP;
 }
 
@@ -430,6 +446,9 @@
 
   if (_access (fname.cstr_oneuse(), 0) == 0)
     return 0;			/* already exists */
+
+  if (uexists("/etc/setup/inhibit-startmenu-icon"))
+    return 0;			/* inhibited by previous user choice */
 
   return IDC_ROOT_MENU;
 }
diff -mru -X patch-excludes src/winsup/cinstall/localdir.cc src-work/winsup/cinstall/localdir.cc
--- src/winsup/cinstall/localdir.cc	Mon Feb 18 13:53:06 2002
+++ src-work/winsup/cinstall/localdir.cc	Sun Mar  3 17:20:34 2002
@@ -45,7 +45,7 @@
 void
 save_local_dir ()
 {
-  io_stream::mkpath_p (PATH_TO_DIR, local_dir);
+  io_stream::mkpath_p (PATH_TO_DIR, String("file://") + local_dir);
 
   io_stream *f;
   if (get_root_dir ().size())

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2688 bytes --]