fix merge conflict in changelog

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

bin/cdist-config

@@ -19,7 +19,7 @@
 #
 #
 
-__cdist_version="1.0.3"
+__cdist_version="1.1.0"
 
 # Fail if something bogus is going on
 set -u

bin/cdist-deploy-to

@@ -67,4 +67,4 @@ cdist-dir push "$__cdist_target_host" "$__cdist_out_object_dir" \
 # And finally - execute the code
 cdist-code-run-all            "$__cdist_target_host"
 
-echo "Configuration successfully finished for $__cdist_target_host"
+echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host"

bin/cdist-env

@@ -18,16 +18,26 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Setup environment for use with cdist
+# Setup environment for use with cdist - must be standalone!
 #
 
-. cdist-config
-[ $# -eq 0 ] || __cdist_usage "no arguments"
+__cdist_pwd="$(pwd -P)"
+__cdist_mydir="${0%/*}";
+__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
+__cdist_myname=${0##*/};
+__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 
-# Allow access to unset variables like PATH and MANPATH
-set +u
-
-echo export PATH=$__cdist_abs_mydir:$PATH
+shell_binary=${SHELL##*/}
 
+NEWPATH="$__cdist_abs_mydir:$PATH"
 cd "$__cdist_abs_mydir/../doc/man"
-echo export MANPATH=$(pwd -P):$MANPATH
+NEWMANPATH="$(pwd -P):$MANPATH"
+
+# Match csh, tcsh to handle differently
+if [ "$(echo $shell_binary | grep 'csh$')" ]; then
+   echo setenv PATH $NEWPATH \;
+   echo setenv MANPATH $NEWMANPATH
+else
+   echo export PATH=$NEWPATH
+   echo export MANPATH=$NEWMANPATH
+fi