rouxdo/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into autorequire

Browse source
This commit is contained in:
Steven Armstrong 2011-11-17 16:37:34 +01:00
commit 1b754ca33f
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README
View file

@ -53,8 +53,6 @@ UNIX, simplicity, familar environment | cdist is configured in POSIX shell
The cdist documentation is included as manpages in the distribution. The cdist documentation is included as manpages in the distribution.
* You can [browse the documentation of the latest version online](man) as well. * 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) * Have a look at the [given speeches](speeches)
### OS support ### OS support
@ -133,7 +131,7 @@ To install cdist, execute the following commands:
export PATH=$PATH:$(pwd -P)/bin export PATH=$PATH:$(pwd -P)/bin
# If you want the manpages # If you want the manpages
./build.sh man ./build man
export MANPATH=$MANPATH:$(pwd -P)/doc/man export MANPATH=$MANPATH:$(pwd -P)/doc/man
@ -180,7 +178,7 @@ To upgrade cdist in the current branch use
git pull git pull
# Also update the manpages # Also update the manpages
./build.sh man ./build man
export MANPATH=$MANPATH:$(pwd -P)/doc/man export MANPATH=$MANPATH:$(pwd -P)/doc/man
If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break. If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.

11
build
View file

@ -26,13 +26,16 @@
# exit on any error # exit on any error
#set -e #set -e
version=$(git describe)
# Manpage and HTML # Manpage and HTML
A2XM="a2x -f manpage --no-xmllint -a encoding=UTF-8" A2XM="a2x -f manpage --no-xmllint -a encoding=UTF-8"
A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8" A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8"
# Developer webbase # Developer webbase
WEBDIR=$HOME/niconetz WEBDIR=$HOME/niconetz
WEBBASE=software/cdist WEBBASE=$WEBDIR/software/cdist
WEBMAN=$WEBBASE/man/$version
WEBPAGE=${WEBBASE}.mdwn WEBPAGE=${WEBBASE}.mdwn
# Documentation # Documentation
@ -95,9 +98,9 @@ case "$1" in
;; ;;
web) web)
cp README ${WEBDIR}/${WEBPAGE} cp README ${WEBPAGE}
rm -rf ${WEBDIR}/${WEBBASE}/man rm -rf ${WEBMAN}
mkdir -p ${WEBDIR}/${WEBBASE}/man/man1 ${WEBDIR}/${WEBBASE}/man/man7 mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7
rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches

2
doc/changelog
View file

@ -1,8 +1,10 @@
2.0.4: 2.0.4:
* Bugfix core: Remove traceback when sending SIGINT (aka Ctrl-C) * 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: __object_fq variable removed (never used)
* Cleanup: Environment variable __self DEPRECATED, use __object_name instead * Cleanup: Environment variable __self DEPRECATED, use __object_name instead
* Cleanup: Environment variable __self scheduled for removal in cdist 2.1 * 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) * New Type: __cron (Steven Armstrong)
2.0.3: 2011-10-18 2.0.3: 2011-10-18