On 5/13/2018 6:33 PM, Tom Eastep wrote:
> On 05/12/2018 02:39 PM, Matt Darfeuille wrote:
>> Signed-off-by: Matt Darfeuille <matd...@gmail.com>
>> ---
>> build/release | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/build/release b/build/release
>> index 6bb7a482..2aea672d 100755
>> --- a/build/release
>> +++ b/build/release
>> @@ -311,6 +311,8 @@ if ! grep "$VERSION"; then
>> fatal_error "File $WEBDIR/index.html does not contain \"${VERSION}\"."
>> fi
>>
>> +[ -f "$WEBDIR/index.html" -a -f "$TOOLSDIR/web/publish" ] &&
>> $TOOLSDIR/web/publish index.html
>> +
>> if [ -z "$GIT_CODE_OBJECT" -a -z "$GIT_RELEASE_OBJECT" ]; then
>> create_tag $GIT
>> create_tag $GITRELEASEDIR
>>
>
> I think that you wanted to publish "$WEBDIR/intex.html" rather than
> "index.html", but a 'feature' of $TOOLSDIR/web/publish is that it uses
> $PWD to determine where on the website to place the published file(s).
> So it is best to
>
> pushd $WEBDIR
> publish index.html
> popd
>
Actually, I forgot to commit the line that will change into $WEBDIR!
(sorry about that).
Patch that will address that to follow along with two others:
- Patch1 will abort the script execution before creating the tags when
{$VERSION|$BASEVERSION Beta n|$BASEVERSION RC n} are not found in index.html
- I moved all the web steps to the end of the release script
Obviously when we're done with the discussion phase I'll resend
everything squashed/fixed up!
-Matt
--
Matt Darfeuille
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
