[rfc][icedtea-web] Removing applications tab in jawas-about

[Andrew Azores]

On 07/10/2013 05:38 PM, Omair Majid wrote:
> Hi,
>
> On 07/10/2013 03:27 PM, Andrew Azores wrote:
>> On 07/10/2013 12:58 PM, Omair Majid wrote:
>>> At some point, it might be a good idea to make this a stand-alone
>>> script and invoke it from make. Keeping all this included in the
>>> Makefile (with all the line-continuations) looks rather painful.
>> Excellent idea.
> I am going to assume there were no errors or typos in moving the code ;)
>
> One style nit: we spaces for indentation, as much as possible.

Fixed, I accidentally left expandtab unset. And I don't believe there 
are any errors or typos left, I've run this through its paces and it 
seems to work just the same as it used to while inlined in the Makefile. 
But there were definitely quite a few errors with it when I first moved 
it over.

>
>> diff --git a/html-gen.sh b/html-gen.sh
>> new file mode 100755
>> --- /dev/null
>> +++ b/html-gen.sh
>> @@ -0,0 +1,91 @@
>> +#!/bin/sh
> I see a bunch of bash-isms in this script (including "[["), so you
> probably want /bin/bash here. bash invoked as /bin/sh is normally more
> lenient than other closer-to-sh shells (like dash).

Good call, I'm just too used to writing very small, 
definitely-sh-compliant scripts, so that shebang line is just sort of 
muscle memory.

> May I suggest adding a one or two line comment to say what this script
> does and how to run it?

Also a good idea. I ended up writing a small novel.

>
>> +	sed -i -r \
>> +	-e "s/\t/    /g" ${c: Convert tabs into four spaces}\
>> +	-e "s/\&/\&/g" ${c: "&" -> "&"}\
>> +	-e "s/  /\ \ /g" ${c: Double-spaces into HTML whitespace for formatting}\
>> +	-e "s/</\&lt;/g" ${c: "<" -> "&lt;"}\
>> +	-e "s/>/\&gt;/g" ${c: ">" -> "&gt;"}\
>> +	-e 's_(\&lt;)?(https?://[^ ]*)(\&gt;| |$$)_\1<a href="\2">\2</a>\3_i' ${c: Creates hyperlinks from http/https URLs}\
>> +	-e 's/\&lt;(.*@.*)\&gt;/\&lt;<a href="mailto:\1\?subject=IcedTea-Web">\1<\/a>\&gt;/i' ${c: Create mailto links from email addresses formatted as <email at example.com>}\
>> +	-e "s/$/<br>/g" ${c: "\n" -> "<br>"}\
>> +	"./$FILE"
> I would have just used multiple sed invocations + bash comments here,
> instead of the (rather clever) parameter expansion. But it's your call.

I've gone and done that and it does look cleaner, although now there's a 
"./$FILE" after every line instead of just once, and the -i -r flags 
every time as well. Also the script does have an elapsed time printout 
in "debug" mode and changing it from one monster of a sed invocation to 
several more manageable ones seems to have increased the total runtime 
of the script by about a factor of 3 (although that really means it's 
about a third of a second now rather than a tenth ;-) ). But this is 
still acceptable, I think.

Changelog:
* Makefile.am (stamps/html-gen): moved plaintext-to-HTML logic into new
shell script.
* html-gen.sh: contains plaintext-to-HTML logic previously found in
Makefile.am. Added a sed expression to cause changelog file listing entries
to be underlined.
* AUTHORS: fixed formatting of one line (removed extra space)

Andrew A
-------------- next part --------------
A non-text attachment was scrubbed...
Name: refactor1.patch
Type: text/x-patch
Size: 6962 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130711/aedeb6e3/refactor1.patch