diff --git a/.gitignore b/.gitignore index 027e64e..4cee1a3 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,6 @@ pug.log go.work dist/ + +# for people whose editor generates tags +*tags* diff --git a/README.md b/README.md index 7c18174..9568fcc 100644 --- a/README.md +++ b/README.md @@ -310,7 +310,7 @@ When `terragrunt` is specified as the program executable, Pug enables "terragrun * Modules are detected via the presence of a `terragrunt.hcl` file. (You may want to rename the top-level `terragrunt.hcl` file to something else otherwise it is mis-detected as a module). * Module dependencies are supported. After modules are loaded, a task invokes `terragrunt graph-dependencies`, from which dependencies are parsed and configured in Pug. If you apply multiple modules Pug ensures their dependencies are respected, applying modules in topological order. If you apply a *destroy* plan for multiple modules, modules are applied in reverse topological order. -* The flag `--terragrunt-non-interactive` is added to commands. +* The flag `--non-interactive` is added to commands. ## Multiple terraform versions diff --git a/hacks/rebuild.sh b/hacks/rebuild.sh index 1c7bc78..f9a6178 100755 --- a/hacks/rebuild.sh +++ b/hacks/rebuild.sh @@ -2,5 +2,13 @@ while true; do go build -o _build/pug && pkill -f '_build/pug' - inotifywait -e attrib $(find . -name '*.go') || exit + + # OSX doesn't have inotifywait, so we use fswatch instead + if [[ "$(uname)" == "Darwin" ]]; then + fswatch -e .git -o $(find . -name '*.go') || exit + elif [[ "$(uname)" == "Linux" ]]; then + inotifywait -e attrib $(find . -name '*.go') || exit + else + echo "Unknown OS: $(uname)" + fi done diff --git a/internal/task/task.go b/internal/task/task.go index 873e876..57f5527 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -193,7 +193,7 @@ func (f *factory) newTask(spec Spec) (*Task, error) { // Perhaps use constants for terraform, tofu, and terragrunt. if task.Program == "terragrunt" && f.terragrunt { task.AdditionalEnv = append(task.AdditionalEnv, "TERRAGRUNT_FORWARD_TF_STDOUT=1") - task.Args = append(task.Args, "--terragrunt-non-interactive") + task.Args = append(task.Args, "--non-interactive") } return task, nil }