Re: [PATCH] Cygwin: doc: Update postinstall/preremove scripts

[Corinna Vinschen <corinna-cygwin@cygwin.com>]

On Mar 13 14:18, Jon Turney wrote:
> On 13/03/2023 09:31, Corinna Vinschen wrote:
> > Hi Jon,
> > 
> > On Mar  8 14:17, Jon Turney wrote:
> > > Update postinstall/preremove scripts to use CYGWIN_START_MENU_SUFFIX and
> > > CYGWIN_SETUP_OPTIONS.
> > 
> > It would be great if you could explain your change in the commit
> > message...
> > 
> 
> Yeah, that's fair. How about:
> 
> "Since setup 2.925, it indicates to postinstall and preremove scripts the
> start menu suffix to use via the CYGWIN_START_MENU_SUFFIX env var.
> 
> It also indicates, via the CYGWIN_SETUP_OPTIONS env var, if the option to
> disable startmenu shortcut creation is supplied.
> 
> Update the Cygwin documentation postinstall and preremove scripts to take
> these env vars into consideration."

Sure, sounds good

> 
> > >   winsup/doc/etc.postinstall.cygwin-doc.sh | 19 +++++++++++++++----
> > >   winsup/doc/etc.preremove.cygwin-doc.sh   |  8 ++++++--
> > >   2 files changed, 21 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh
> > > index 97f88a16d..313c1d3ff 100755
> > > --- a/winsup/doc/etc.postinstall.cygwin-doc.sh
> > > +++ b/winsup/doc/etc.postinstall.cygwin-doc.sh
> > > @@ -36,9 +36,20 @@ do
> > >   	fi
> > >   done
> > > +# setup was run with options not to create startmenu items
> > > +case ${CYGWIN_SETUP_OPTIONS} in
> > > +  *no-startmenu*)
> > > +    exit 0
> > > +    ;;
> > > +esac
> > > +
> > >   # Cygwin Start Menu directory
> > > -case $(uname -s) in *-WOW*) wow64=" (32-bit)" ;; esac
> > > -smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin${wow64}"
> > > +if [ ! -v CYGWIN_START_MENU_SUFFIX ]
> > 
> > Isn't -v a bash extension? Ideally the shebang should reflect that.
> > Otherwise, -z?
> 
> This is actually controlled by setup, which runs postinstall and preremove
> scripts with an .sh extension using bash.
> 
> But yeah, I'll change the shebang.

Great. Just push when you're ready.


Thanks,
Corinna