From cff8513220bac1c938c366df90757372e4a1bb76 Mon Sep 17 00:00:00 2001 From: Brian Inglis Date: Wed, 5 Jul 2017 12:28:54 -0600 Subject: [PATCH] fix cygwin-doc postinstall/preremove no SMPrograms/Cygwin dir --- winsup/doc/etc.postinstall.cygwin-doc.sh | 45 ++++++++++++++---------- winsup/doc/etc.preremove.cygwin-doc.sh | 45 ++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 22 deletions(-) diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh index 3a9457fbb..1d41ef0c1 100755 --- a/winsup/doc/etc.postinstall.cygwin-doc.sh +++ b/winsup/doc/etc.postinstall.cygwin-doc.sh @@ -6,27 +6,17 @@ # CYGWINFORALL=-A if install for All Users # installs local shortcuts for All Users or Current User in # {ProgramData,~/Appdata/Roaming}/Microsoft/Windows/Start Menu/Programs/Cygwin/ - -cygp=/bin/cygpath -mks=/bin/mkshortcut -un=/bin/uname -site=https://cygwin.com - -# check for programs -for p in $un $cygp $mks -do - if [ ! -x $p ] - then - echo "Can't find program '$p'" - exit 2 - fi -done +# exits quietly if directory does not exist as presumably no shortcuts desired doc=/usr/share/doc/cygwin-doc -html=$doc/html -smpc_dir="$($cygp $CYGWINFORALL -P -U)/Cygwin" +site=https://cygwin.com +cygp=/bin/cygpath +mks=/bin/mkshortcut -for d in $doc $html "$smpc_dir" +html=$doc/html + +# check source directories created +for d in $doc $html do if [ ! -d "$d/" ] then @@ -35,6 +25,23 @@ do fi done +# check for programs +for p in $cygp $mks +do + if [ ! -x $p ] + then + echo "Can't find program '$p'" + exit 2 + fi +done + +# Cygwin Start Menu directory +smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin" + +# check Cygwin Start Menu directory still exists +[ -d "$smpc_dir/" ] || exit 0 + +# check Cygwin Start Menu directory writable if [ ! -w "$smpc_dir/" ] then echo "Can't write to directory '$smpc_dir'" @@ -42,7 +49,7 @@ then fi # mkshortcut works only in current directory - change to Cygwin Start Menu -cd "$smpc_dir" || exit 2 # quit if not found +cd "$smpc_dir/" || exit 0 # quit if not found # create User Guide and API PDF and HTML shortcuts while read target name desc diff --git a/winsup/doc/etc.preremove.cygwin-doc.sh b/winsup/doc/etc.preremove.cygwin-doc.sh index 817d6d68e..09e0c9efc 100755 --- a/winsup/doc/etc.preremove.cygwin-doc.sh +++ b/winsup/doc/etc.preremove.cygwin-doc.sh @@ -6,9 +6,48 @@ # CYGWINFORALL=-A if remove for All Users # remove local shortcuts for All Users or Current User in # {ProgramData,~/Appdata/Roaming}/Microsoft/Windows/Start Menu/Programs/Cygwin/ +# exits quietly if directory does not exist as presumably no shortcuts desired -cd "$(/bin/cygpath $CYGWINFORALL -P -U)/Cygwin" || exit 2 +doc=/usr/share/doc/cygwin-doc +cygp=/bin/cygpath +rm=/bin/rm -/bin/rm -f -- "User Guide (PDF).lnk" "User Guide (HTML).lnk" \ - "API (PDF).lnk" "API (HTML).lnk" "Home Page.lnk" "FAQ.lnk" +html=$doc/html + +# check for programs +for p in $cygp $rm +do + if [ ! -x $p ] + then + echo "Can't find program '$p'" + exit 2 + fi +done + +# Cygwin Start Menu directory +smpc_dir="$($cygp $CYGWINFORALL -P -U --)/Cygwin" + +# check Cygwin Start Menu directory still exists +[ -d "$smpc_dir/" ] || exit 0 + +# check Cygwin Start Menu directory writable +if [ ! -w "$smpc_dir/" ] +then + echo "Can't write to directory '$smpc_dir'" + exit 1 +fi + +# remove User Guide and API PDF and HTML, Home Page and FAQ URL link shortcuts +while read target name desc +do + lnk="$smpc_dir/$name.lnk" + [ -f "$lnk" ] && $rm -f -- "$lnk" +done <