JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: Use a separate Start Menu folder for WoW64 installs

Browse Source 
This aligns the shortcuts to documentation with the setup changes in
https://sourceware.org/pipermail/cygwin-apps/2020-March/039873.html

v2:
Create/remove the Start Menu directory as needed/possible
Correctly use that directory when making shortcuts
This commit is contained in:
Jon Turney 2020-03-19 13:54:10 +00:00
parent 6b0c1e7cc8
commit 6c8392d651
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/doc/etc.postinstall.cygwin-doc.sh
View File

@ -37,10 +37,11 @@ do
done done
# Cygwin Start Menu directory # 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 # ensure Cygwin Start Menu directory exists
[ -d "$smpc_dir/" ] || exit 0 /usr/bin/mkdir -p "$smpc_dir"
# check Cygwin Start Menu directory writable # check Cygwin Start Menu directory writable
if [ ! -w "$smpc_dir/" ] if [ ! -w "$smpc_dir/" ]
@ -52,7 +53,7 @@ fi
# create User Guide and API PDF and HTML shortcuts # create User Guide and API PDF and HTML shortcuts
while read target name desc while read target name desc
do do
[ -r "$target" ] && $mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -- $target [ -r "$target" ] && $mks $CYGWINFORALL -P -n "Cygwin${wow64}/$name" -d "$desc" -- $target
done <<EOF done <<EOF
$doc/cygwin-ug-net.pdf User\ Guide\ \(PDF\) Cygwin\ User\ Guide\ PDF $doc/cygwin-ug-net.pdf User\ Guide\ \(PDF\) Cygwin\ User\ Guide\ PDF
$html/cygwin-ug-net/index.html User\ Guide\ \(HTML\) Cygwin\ User\ Guide\ HTML $html/cygwin-ug-net/index.html User\ Guide\ \(HTML\) Cygwin\ User\ Guide\ HTML
@ -63,9 +64,8 @@ EOF
# create Home Page and FAQ URL link shortcuts # create Home Page and FAQ URL link shortcuts
while read target name desc while read target name desc
do do
$mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -a $target -- $launch $mks $CYGWINFORALL -P -n "Cygwin${wow64}/$name" -d "$desc" -a $target -- $launch
done <<EOF done <<EOF
$site/index.html Home\ Page Cygwin\ Home\ Page\ Link $site/index.html Home\ Page Cygwin\ Home\ Page\ Link
$site/faq.html FAQ Cygwin\ Frequently\ Asked\ Questions\ Link $site/faq.html FAQ Cygwin\ Frequently\ Asked\ Questions\ Link
EOF EOF

5
winsup/doc/etc.preremove.cygwin-doc.sh
View File

@ -26,7 +26,8 @@ do
done done
# Cygwin Start Menu directory # 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 # check Cygwin Start Menu directory still exists
[ -d "$smpc_dir/" ] || exit 0 [ -d "$smpc_dir/" ] || exit 0
@ -52,3 +53,5 @@ $site/index.html Home\ Page Cygwin\ Home\ Page\ Link
$site/faq.html FAQ Cygwin\ Frequently\ Asked\ Questions\ Link $site/faq.html FAQ Cygwin\ Frequently\ Asked\ Questions\ Link
EOF EOF
# remove Cygwin Start Menu directory if empty
/usr/bin/rmdir --ignore-fail-on-non-empty "${smpc_dir}"