Web lists-archives.com


On 2017-06-26 10:42, Corinna Vinschen wrote:
> On Jun 26 10:25, Brian Inglis wrote:
>> On 2017-06-26 02:31, Corinna Vinschen wrote:
>>> On Jun 23 12:47, Brian Inglis wrote:
>>>> On 2017-06-23 12:25, Corinna Vinschen wrote:
>>>>> On Jun 23 19:52, Marco Atzeri wrote:
>>>>>> On 22/06/2017 15:58, Corinna Vinschen wrote:
>>>>>>> I uploaded a new Cygwin test release 2.8.1-0.1
>>>>>>> I'm planning for a release next week.  Please test.
>>>>>> $ /etc/postinstall/cygwin-doc.sh
>>>>>> Can't find directory '/usr/share/doc/cygwin-2.8.1'
>>>>> Fixed in git.
>>>> Darn you were fast!
>>>> You might want to apply the rest of the attached format-patch,
>>>> as it makes things clearer, more maintainable, and shorter.
>>> Sure, but your patch doesn't apply cleanly.  Care to check?
>> Refreshed, retried, reattached - not seeing any differences.
> Weird.  See below.
>> Care to give me hint to get a clean format-patch of a changed file against your
>> master?
>> My approach tends to be scorched earth: rm -rf repo && git clone repo!
> `git pull' should suffice...
>> Ramadan is just past, so not a new moon, should I wait to sacrifice more of my
>> hair, to appease git? ;^>
> git am fails because your patch has still the already applied first
> hunk.  If you remove that, and ideally change the subject to match
> what the remaining parts of the patch are doing, it should fly.
Thanks for your patience.
Recloned, recopied from my original, reformated patch attached: hashbang changed
as this script only needs {da,}sh.
Is there an option so git will download your updated source, reject my patched
source in place, and not just overwrite it?

Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
From 68e3280e0bce70b3c296b4815124d7fafc84774c Mon Sep 17 00:00:00 2001
From: Brian Inglis <Brian.Inglis@xxxxxxxxxxxxxxxxxx>
Date: Mon, 26 Jun 2017 13:43:40 -0600
Subject: [PATCH] replace shortcut parameter assignments with read loops, run
 with sh

 winsup/doc/etc.postinstall.cygwin-doc.sh | 64 ++++++++++----------------------
 1 file changed, 20 insertions(+), 44 deletions(-)

diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh
index 124a5ddf5..3a9457fbb 100755
--- a/winsup/doc/etc.postinstall.cygwin-doc.sh
+++ b/winsup/doc/etc.postinstall.cygwin-doc.sh
@@ -1,12 +1,8 @@
 # /etc/postinstall/cygwin-doc.sh - cygwin-doc postinstall script.
 # installs Cygwin Start Menu shortcuts for Cygwin User Guide and API PDF and
 # HTML if in doc dir, and links to Cygwin web site home page and FAQ
-# Assumes you are running setup.exe 2.510.2.2 or newer, executed by /bin/bash
-# and not /bin/[da]sh (if you are running an older setup.exe, this postinstall
-# script can't do anything).
 # 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/
@@ -48,43 +44,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
-n="User Guide (PDF)"
-d="PDF Cygwin User Guide"
-[ -r $p ] && $mks -n "$n" -d "$d" $p
-n="User Guide (HTML)"
-d="HTML Cygwin User Guide"
-[ -r $i ] && $mks -n "$n" -d "$d" $i
-n="API (PDF)"
-d="PDF Cygwin API Reference"
-[ -r $p ] && $mks -n "$n" -d "$d" $p
-n="API (HTML)"
-d="HTML Cygwin API Reference"
-[ -r $i ] && $mks -n "$n" -d "$d" $i
-# Home Page URL
-n="Home Page"
-d="Cygwin $n"
-$mks -n "$n" -d "$d" $h
-d="Cygwin Frequently Asked Questions (with answers)"
-$mks -n "$n" -d "$d" $h
+# create User Guide and API PDF and HTML shortcuts
+while read target name desc
+	[ -r $t ] && $mks -n "$name" -d "$desc" $target
+done <<EOF
+$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
+$doc/cygwin-api.pdf		API\ \(PDF\)	Cygwin\ API\ Reference\ PDF
+$html/cygwin-api/index.html	API\ \(HTML\)	Cygwin\ API\ Reference\ HTML
+# create Home Page and FAQ URL link shortcuts
+while read target name desc
+	$mks -n "$name" -d "$desc" $target
+done <<EOF
+$site/index.html	Home\ Page	Cygwin\ Home\ Page\ Link
+$site/faq.html		FAQ	Cygwin\ Frequently\ Asked\ Questions\ Link

Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple