Commit 0dd1c704 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix(hooks): chmod only when required

parent e7c245d0
Loading
Loading
Loading
Loading
+16 −10
Original line number Diff line number Diff line
@@ -348,6 +348,17 @@ stages:
    done
  }

  function exec_hook() {
    if [[ ! -x "$1" ]] && ! chmod +x "$1"
    then
      log_warn "... could not make \\e[33;1m${1}\\e[0m executable: please do it (chmod +x)"
      # fallback technique
      sh "$1"
    else
      "$1"
    fi
  }

  function tf_init() {
    opts=$1
    extra_opts=$2
@@ -385,8 +396,7 @@ stages:
    prescript="$TF_SCRIPTS_DIR/tf-pre-init.sh"
    if [[ -f "$prescript" ]]; then
      log_info "--- \\e[32mpre-init\\e[0m hook (\\e[33;1m${prescript}\\e[0m) found: execute"
      chmod +x "$prescript"
      "$prescript"
      exec_hook "$prescript"
    else
      log_info "--- \\e[32mpre-init\\e[0m hook (\\e[33;1m${prescript}\\e[0m) not found: skip"
    fi
@@ -510,8 +520,7 @@ stages:
    prescript="$TF_SCRIPTS_DIR/tf-pre-apply.sh"
    if [[ -f "$prescript" ]]; then
      log_info "--- \\e[32mpre-apply\\e[0m hook (\\e[33;1m${prescript}\\e[0m) found: execute"
      chmod +x "$prescript"
      "$prescript"
      exec_hook "$prescript"
    else
      log_info "--- \\e[32mpre-apply\\e[0m hook (\\e[33;1m${prescript}\\e[0m) not found: skip"
    fi
@@ -537,8 +546,7 @@ stages:
    postscript="$TF_SCRIPTS_DIR/tf-post-apply.sh"
    if [[ -f "$postscript" ]]; then
      log_info "--- \\e[32mpost-apply\\e[0m hook (\\e[33;1m${postscript}\\e[0m) found: execute"
      chmod +x "$postscript"
      "$postscript"
      exec_hook "$postscript"
    else
      log_info "--- \\e[32mpost-apply\\e[0m hook (\\e[33;1m${postscript}\\e[0m) not found: skip"
    fi
@@ -559,8 +567,7 @@ stages:
    prescript="$TF_SCRIPTS_DIR/tf-pre-destroy.sh"
    if [[ -f "$prescript" ]]; then
      log_info "--- \\e[32mpre-destroy\\e[0m hook (\\e[33;1m${prescript}\\e[0m) found: execute"
      chmod +x "$prescript"
      "$prescript"
      exec_hook "$prescript"
    else
      log_info "--- \\e[32mpre-destroy\\e[0m hook (\\e[33;1m${prescript}\\e[0m) not found: skip"
    fi
@@ -592,8 +599,7 @@ stages:
    postscript="$TF_SCRIPTS_DIR/tf-post-destroy.sh"
    if [[ -f "$postscript" ]]; then
      log_info "--- \\e[32mpost-destroy\\e[0m hook (\\e[33;1m${postscript}\\e[0m) found: execute"
      chmod +x "$postscript"
      "$postscript"
      exec_hook "$postscript"
    else
      log_info "--- \\e[32mpost-destroy\\e[0m hook (\\e[33;1m${postscript}\\e[0m) not found: skip"
    fi