From 3bc7d9d09462d73c81e7f98290a63e82a74a1a05 Mon Sep 17 00:00:00 2001
From: Mike Vink <ivi@vinkies.net>
Date: Fri, 22 Dec 2023 21:42:23 +0100
Subject: simplify some things

---
 mut/bin/terragrunt             | 49 ++++++++++++------------------------------
 mut/neovim/fnl/conf/events.fnl |  9 +++++++-
 2 files changed, 22 insertions(+), 36 deletions(-)

(limited to 'mut')

diff --git a/mut/bin/terragrunt b/mut/bin/terragrunt
index f639f0f..d0b47f7 100755
--- a/mut/bin/terragrunt
+++ b/mut/bin/terragrunt
@@ -1,35 +1,18 @@
 #!/bin/sh
 TERRAGRUNT_ARGS=()
-CONTEXT=""
-ENV=""
-MODULE=""
-FULL=0
 while [[ $# -gt 0 ]]; do
     case $1 in
         -full)
             FULL=1
             shift
             ;;
-        -m|--module-path)
-            MODULE="$2"
+        -p|--path)
+            path="$2"
             shift
             shift
             ;;
-        -m=*|--module-path=*)
-            MODULE="${1#*=}"
-            shift
-            ;;
-        -e|--env)
-            ABS_ENV="$2"
-            CONTEXT=${ABS_ENV%/*}
-            ENV=${ABS_ENV#*/}
-            shift
-            shift
-            ;;
-        -e=*|--env=*)
-            ABS_ENV="${1#*=}"
-            CONTEXT=${ABS_ENV%/*}
-            ENV=${ABS_ENV#*/}
+        -p=*|--path=*)
+            path="${1#*=}"
             shift
             ;;
         *|-*)
@@ -80,18 +63,14 @@ do
     esac
 done
 
-ENVIRONMENTS=""
-if [ -z $ENV -a -z $MODULE ]; then
-    ENVIRONMENTS="$REPO"
-else
-    ENVIRONMENTS="$REPO/environments"
-fi
-WORKDIR="$ENVIRONMENTS/$ENV/$MODULE"
+WORKDIR="$REPO/$path"
 
-# TODO(mike): how to do concise mode  | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan)'
-# TODO(mike): check expiry of azure directory
-if [[ $FULL -eq 0 ]]; then
-    docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep --line-buffered -E '(^ .*[#~+-] .*|^[[:punct:]]|^Plan.*|^\S.*)'
-else
-    docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi
-fi
+docker run --rm -i $TTY \
+    $VARIABLES \
+    -v $HOME/.terragrunt-cache:/tmp \
+    -v $HOME/.azure:/root/.azure \
+    -v $HOME/.netrc:/root/.netrc \
+    $TERRAGRUNT_EXTRA_MOUNTS \
+    -v ${REPO}:${REPO} \
+    -w ${WORKDIR} \
+    $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi
diff --git a/mut/neovim/fnl/conf/events.fnl b/mut/neovim/fnl/conf/events.fnl
index 69758dc..a2e51be 100644
--- a/mut/neovim/fnl/conf/events.fnl
+++ b/mut/neovim/fnl/conf/events.fnl
@@ -33,4 +33,11 @@
   {:group "conf#events"
    :pattern ["*"]
    :callback #(if (= 1 (vim.fn.filereadable session-file))
-                  (vim.schedule #(vim.cmd (.. "source " session-file))))})
+                  (do
+                    (local start-with-arg (>= 1 (vim.fn.argc)))
+                    (local file (vim.fn.argv 0))
+                    (local cwd (vim.fn.getcwd))
+                    (vim.schedule #(vim.cmd (.. "source " session-file)))
+                    (if start-with-arg (vim.schedule #(do
+                                                        (vim.cmd (.. "cd " cwd))
+                                                        (vim.cmd (.. "e " file)))))))})
-- 
cgit v1.2.3