On 5/16/2018 8:32 PM, Matt Darfeuille wrote: > On 5/16/2018 6:12 PM, Tom Eastep wrote: >> On 05/14/2018 04:17 AM, Matt Darfeuille wrote: >>> Signed-off-by: Matt Darfeuille <matd...@gmail.com> >>> --- >>> 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. >> > > Would the following patch do the trick? > I'd rather not go the pushd and popd way! :) >
Tom, the last sent patch (Allow release script to work outside of build dir) is maybe more useful then "Move back in base directory after publishing"? Or am I still missing something? -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
