On 05/14/2018 04:17 AM, Matt Darfeuille wrote: > Signed-off-by: Matt Darfeuille <[email protected]> > --- > build/release | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/build/release b/build/release > index 7d059868..942c522f 100755 > --- a/build/release > +++ b/build/release > @@ -325,8 +325,6 @@ case $VERSION in > ;; > esac > > -[ -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 > @@ -356,3 +354,9 @@ for repo in $REPOSITORIES; do > push_command_func $GIT $repo master > push_command_func $GITRELEASEDIR $repo master > done > + > +cd $WEBDIR > + > +[ -f "$WEBDIR/index.html" -a -f "$TOOLSDIR/web/publish" ] && > $TOOLSDIR/web/publish index.html > + > +cd .. >
Hi Matt, This doesn't work. It will leave the CWD as ~/shorewall/, but 'upload' assumes that the CWD is ~/shorewall/build/$BASEVERSION.. I always run 'release' in that directory. That is why I recommended using pushd and popd. Alternatively, you could move the 'publish' command to the end of the script, with a comment that it must be last. Thanks, -Tom -- Tom Eastep \ Q: What do you get when you cross a mobster with Shoreline, \ an international standard? Washington, USA \ A: Someone who makes you an offer you can't http://shorewall.org \ understand \_______________________________________________
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
