[PATCH] Cygwin: Use a separate Start Menu folder for WoW64 installs

Corinna Vinschen corinna-cygwin@cygwin.com
Thu Mar 19 15:04:19 GMT 2020


On Mar 19 16:02, Corinna Vinschen wrote:
> On Mar 19 13:58, Jon Turney wrote:
> > This aligns the shortcuts to documentation with the setup changes in
> > https://sourceware.org/pipermail/cygwin-apps/2020-March/039873.html
> > ---
> >  winsup/doc/etc.postinstall.cygwin-doc.sh | 3 ++-
> >  winsup/doc/etc.preremove.cygwin-doc.sh   | 3 ++-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh
> > index de7d9e0c3..65ce2ad77 100755
> > --- a/winsup/doc/etc.postinstall.cygwin-doc.sh
> > +++ b/winsup/doc/etc.postinstall.cygwin-doc.sh
> > @@ -37,7 +37,8 @@ do
> >  done
> >  
> >  # Cygwin Start Menu directory
> > -smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin"
> > +case $(uname -s) in *-WOW*) wow64=" (32-bit)" ;; esac
> > +smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin${wow64}"
> >  
> >  # check Cygwin Start Menu directory exists
> >  [ -d "$smpc_dir/" ] || exit 0
> > diff --git a/winsup/doc/etc.preremove.cygwin-doc.sh b/winsup/doc/etc.preremove.cygwin-doc.sh
> > index 5e47eb579..f07b70c5d 100755
> > --- a/winsup/doc/etc.preremove.cygwin-doc.sh
> > +++ b/winsup/doc/etc.preremove.cygwin-doc.sh
> > @@ -26,7 +26,8 @@ do
> >  done
> >  
> >  # Cygwin Start Menu directory
> > -smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin"
> > +case $(uname -s) in *-WOW*) wow64=" (32-bit)" ;; esac
> > +smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin${wow64}"
> >  
> >  # check Cygwin Start Menu directory still exists
> >  [ -d "$smpc_dir/" ] || exit 0
> > -- 
> > 2.21.0
> 
> Good idea, please push.

...this requires a new release of setup and Cygwin in lockstep, right?


Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://cygwin.com/pipermail/cygwin-patches/attachments/20200319/fc428ffc/attachment.sig>


More information about the Cygwin-patches mailing list