From 3f92d6ec6f0e715cbd6629634e66a306603532a5 Mon Sep 17 00:00:00 2001 From: Brian Inglis Date: Fri, 23 Jun 2017 12:38:16 -0600 Subject: [PATCH] cygwin: doc: Fix doc install path in postinstall script --- winsup/doc/etc.postinstall.cygwin-doc.sh | 62 +++++++++++--------------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh index dbb641219..ff1d9624e 100755 --- a/winsup/doc/etc.postinstall.cygwin-doc.sh +++ b/winsup/doc/etc.postinstall.cygwin-doc.sh @@ -26,9 +26,7 @@ do fi done -cygver=$($un -r) # release - numeric version (build info) -cygver=${cygver%\(*\)} # strip build info -doc=/usr/share/doc/cygwin-$cygver +doc=/usr/share/doc/cygwin-doc html=$doc/html smpc_dir="$($cygp $CYGWINFORALL -P -U)/Cygwin" @@ -50,43 +48,23 @@ fi # mkshortcut works only in current directory - change to Cygwin Start Menu cd "$smpc_dir" || exit 2 # quit if not found -# User Guide PDF & HTML -p=$doc/cygwin-ug-net.pdf -n="User Guide (PDF)" -d="PDF Cygwin User Guide" - -[ -r $p ] && $mks -n "$n" -d "$d" $p - -i=$html/cygwin-ug-net/index.html -n="User Guide (HTML)" -d="HTML Cygwin User Guide" - -[ -r $i ] && $mks -n "$n" -d "$d" $i - -# API PDF & HTML -p=$doc/cygwin-api.pdf -n="API (PDF)" -d="PDF Cygwin API Reference" - -[ -r $p ] && $mks -n "$n" -d "$d" $p - -i=$html/cygwin-api/index.html -n="API (HTML)" -d="HTML Cygwin API Reference" - -[ -r $i ] && $mks -n "$n" -d "$d" $i - -# Home Page URL -h=$site/index.html -n="Home Page" -d="Cygwin $n" - -$mks -n "$n" -d "$d" $h - -# FAQ URL -h=$site/faq.html -n="FAQ" -d="Cygwin Frequently Asked Questions (with answers)" - -$mks -n "$n" -d "$d" $h +# create User Guide and API PDF and HTML shortcuts +while read t n d +do + [ -r $t ] && $mks -n "$n" -d "$d" $t +done <