diff --git a/build b/build index d7426feb..76057530 100755 --- a/build +++ b/build @@ -122,11 +122,6 @@ case "$1" in rm -rf ${WEBMAN} mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7 - # old stuff - # rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches - # cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches - # git describe > ${WEBDIR}/${WEBBASE}/man/VERSION - cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1 cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7 diff --git a/docs/dev/releasehelper b/docs/dev/releasehelper old mode 100755 new mode 100644 index 197ab2d3..4a570f89 --- a/docs/dev/releasehelper +++ b/docs/dev/releasehelper @@ -30,10 +30,10 @@ read wait version=$changelog_version # get target branch -branch=${version%\.*} +target_branch=${version%\.*} +current_branch=$(git rev-parse --abbrev-ref HEAD) -echo "Selecting branch $branch for merging" -exit 0 +echo "Selected branch $target_branch for merging $current_branch" # add tag printf "Enter tag description for %s> " "$version" @@ -41,14 +41,14 @@ read tagmessage git tag "$version" -m "$tagmessage" # Import into current version branch -printf "Press enter to git merge into branch \"$branch\" > " +printf "Press enter to git merge into branch \"$target_branch\" > " read prompt -git checkout $branch -git merge master -git checkout master +git checkout "$target_branch" +git merge "$current_branch" +git checkout "$current_branch" # Publish manpages and sourcecode -printf "Press enter to publish doc/ and code/ > " +printf "Press enter to publish doc/ code/ pypi for $version > " read prompt ./build web ./build pub