Merge branch 'master' into autorequire
This commit is contained in:
commit
1b754ca33f
6
README
6
README
|
@ -53,8 +53,6 @@ UNIX, simplicity, familar environment | cdist is configured in POSIX shell
|
|||
The cdist documentation is included as manpages in the distribution.
|
||||
|
||||
* You can [browse the documentation of the latest version online](man) as well.
|
||||
* Or you can watch the youtube **video**
|
||||
[cdist installation and first usage in less than 60 seconds][http://www.youtube.com/watch?v=PRMjzy48eTI).
|
||||
* Have a look at the [given speeches](speeches)
|
||||
|
||||
### OS support
|
||||
|
@ -133,7 +131,7 @@ To install cdist, execute the following commands:
|
|||
export PATH=$PATH:$(pwd -P)/bin
|
||||
|
||||
# If you want the manpages
|
||||
./build.sh man
|
||||
./build man
|
||||
export MANPATH=$MANPATH:$(pwd -P)/doc/man
|
||||
|
||||
|
||||
|
@ -180,7 +178,7 @@ To upgrade cdist in the current branch use
|
|||
git pull
|
||||
|
||||
# Also update the manpages
|
||||
./build.sh man
|
||||
./build man
|
||||
export MANPATH=$MANPATH:$(pwd -P)/doc/man
|
||||
|
||||
If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
|
||||
|
|
11
build
11
build
|
@ -26,13 +26,16 @@
|
|||
# exit on any error
|
||||
#set -e
|
||||
|
||||
version=$(git describe)
|
||||
|
||||
# Manpage and HTML
|
||||
A2XM="a2x -f manpage --no-xmllint -a encoding=UTF-8"
|
||||
A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8"
|
||||
|
||||
# Developer webbase
|
||||
WEBDIR=$HOME/niconetz
|
||||
WEBBASE=software/cdist
|
||||
WEBBASE=$WEBDIR/software/cdist
|
||||
WEBMAN=$WEBBASE/man/$version
|
||||
WEBPAGE=${WEBBASE}.mdwn
|
||||
|
||||
# Documentation
|
||||
|
@ -95,9 +98,9 @@ case "$1" in
|
|||
;;
|
||||
|
||||
web)
|
||||
cp README ${WEBDIR}/${WEBPAGE}
|
||||
rm -rf ${WEBDIR}/${WEBBASE}/man
|
||||
mkdir -p ${WEBDIR}/${WEBBASE}/man/man1 ${WEBDIR}/${WEBBASE}/man/man7
|
||||
cp README ${WEBPAGE}
|
||||
rm -rf ${WEBMAN}
|
||||
mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7
|
||||
|
||||
rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches
|
||||
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
2.0.4:
|
||||
* Bugfix core: Remove traceback when sending SIGINT (aka Ctrl-C)
|
||||
* Bugfix core: Accept parameters with - in the name (Steven Armstrong)
|
||||
* Cleanup: __object_fq variable removed (never used)
|
||||
* Cleanup: Environment variable __self DEPRECATED, use __object_name instead
|
||||
* Cleanup: Environment variable __self scheduled for removal in cdist 2.1
|
||||
* Documentation: Many examples for use of __remote_* (Steven Armstrong)
|
||||
* New Type: __cron (Steven Armstrong)
|
||||
|
||||
2.0.3: 2011-10-18
|
||||
|
|
Loading…
Reference in a new issue