Commit c658c4aa authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: hanging awk script

parent 15e074df

templates/gitlab-ci-k8s.yml

+1 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ stages: 
  }



  function awkenvsubst() {

    awk '!/# *nosubst/{while(match($0,"[$%]{[^}]*}")) {g0=substr($0,RSTART,RLENGTH); val=ENVIRON[substr(g0,3,RLENGTH-3)]; gsub(/["\\]/,"\\\\&",val); gsub("\n","\\n",val);gsub("\r","\\r",val); gsub(g0,val)}}1'

    awk '!/# *nosubst/{while(match($0,"[$%]{[^}]*}")) {var=substr($0,RSTART+2,RLENGTH -3);val=ENVIRON[var]; gsub(/["\\]/,"\\\\&",val); gsub("\n","\\n",val);gsub("\r","\\r",val); gsub("[$%]{"var"}",val)}}1'

  }



  function exec_hook() {
@@ -345,7 +345,6 @@ stages: 
      log_info "--- \\e[32mkubectl apply\\e[0m"

      kubectl ${TRACE+-v=5} "$action" -k "$deploymentdir"

    else



      # find deployment file

      deploymentfile=$(ls -1 "$K8S_SCRIPTS_DIR/deployment-${environment_type}.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/deployment.yml" 2>/dev/null || echo "")

      if [[ -z "$deploymentfile" ]]
@@ -359,7 +358,6 @@ stages: 


      log_info "--- \\e[32mkubectl apply\\e[0m"

      kubectl ${TRACE+-v=5} "$action" -f ./generated-deployment.yml



    fi

  }