thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into type__rbenv

Browse source
This commit is contained in:
Nico Schottelius 2014-02-14 21:25:18 +01:00
commit 0fdacac8ed
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -99,7 +99,7 @@ man-dist: man check-date
cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7 cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
man-fix-link: web-pub man-latest-link: web-pub
# Fix ikiwiki, which does not like symlinks for pseudo security # Fix ikiwiki, which does not like symlinks for pseudo security
ssh tee.schottelius.org \ ssh tee.schottelius.org \
"cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest" "cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
@ -146,7 +146,8 @@ web-dist: web-blog web-doc
web-pub: web-dist man-dist speeches-dist web-pub: web-dist man-dist speeches-dist
cd "${WEBDIR}" && make pub cd "${WEBDIR}" && make pub
web-release-all: man-fix-link web-release-all: man-latest-link
web-release-all-no-latest: web-pub
################################################################################ ################################################################################
# Release: Mailinglist # Release: Mailinglist

4
bin/build-helper
View file

@ -256,7 +256,11 @@ eof
make pub make pub
# publish man, speeches, website # publish man, speeches, website
if [ "$masterbranch" = yes ]; then
make web-release-all make web-release-all
else
make web-release-all-no-latest
fi
# Ensure that pypi release has the right version # Ensure that pypi release has the right version
"$0" version "$0" version