diff options
Diffstat (limited to 'system/cfengine/doinst.sh')
| -rw-r--r-- | system/cfengine/doinst.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/system/cfengine/doinst.sh b/system/cfengine/doinst.sh index 0518d145cb..5740fda749 100644 --- a/system/cfengine/doinst.sh +++ b/system/cfengine/doinst.sh @@ -1,19 +1,24 @@ config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... } -# Add a sample rc file for the admin to consider -config etc/rc.d/rc.cfengine.new +# Keep same perms on rc.cfengine: +if [ -e etc/rc.d/rc.cfengine ]; then + cp -a etc/rc.d/rc.cfengine etc/rc.d/rc.cfengine.new.incoming + cat etc/rc.d/rc.cfengine.new > etc/rc.d/rc.cfengine.new.incoming + mv etc/rc.d/rc.cfengine.new.incoming etc/rc.d/rc.cfengine.new +fi +config etc/rc.d/rc.cfengine.new config var/cfengine/inputs/update.conf.new config var/cfengine/inputs/cfagent.conf.new config var/cfengine/inputs/cfservd.conf.new |