diff --git a/lib/ctrl.lib.sh b/lib/ctrl.lib.sh index 4dc4a7c..77cf2ef 100644 --- a/lib/ctrl.lib.sh +++ b/lib/ctrl.lib.sh @@ -115,6 +115,7 @@ zaf_ctrl_sudo() { pdir="$3" plugin=$1 + ! [ -d "$ZAF_SUDOERSD" ] && zaf_wrn "$ZAF_SUDOERSD nonexistent! Skipping sudo install!" zaf_dbg "Installing sudoers entry $ZAF_SUDOERSD/zaf_$plugin" sudo=$(zaf_ctrl_get_global_option $2 "Sudo" | zaf_far '{PLUGINDIR}' "${plugindir}") [ -z "$sudo" ] && return # Nothing to install @@ -142,6 +143,7 @@ zaf_ctrl_cron() { pdir="$3" plugin=$1 + ! [ -d "$ZAF_CROND" ] && zaf_wrn "$ZAF_CROND nonexistent! Skipping cron install!" zaf_dbg "Installing cron entry $ZAF_CROND/zaf_$plugin" cron=$(zaf_ctrl_get_global_option $2 "Cron") [ -z "$cron" ] && return # Nothing to install diff --git a/lib/zaf.lib.sh b/lib/zaf.lib.sh index 7ba395b..fc9322b 100644 --- a/lib/zaf.lib.sh +++ b/lib/zaf.lib.sh @@ -296,12 +296,12 @@ zaf_install_plugin() { control=${plugindir}/control.zaf [ "$ZAF_DEBUG" -gt 1 ] && zaf_plugin_info "${control}" zaf_ctrl_check_deps "${control}" - zaf_ctrl_install "$url" "${control}" "${plugindir}" zaf_ctrl_sudo "$plugin" "${control}" "${plugindir}" zaf_ctrl_cron "$plugin" "${control}" "${plugindir}" zaf_ctrl_generate_cfg "${control}" "${plugin}" \ | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf zaf_dbg "Generated ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf" + zaf_ctrl_install "$url" "${control}" "${plugindir}" else zaf_err "Cannot install plugin '$plugin' to $plugindir!" fi