From 9e4b91bdfbdba794bb15af62f896ca59b64c4f22 Mon Sep 17 00:00:00 2001
From: Abin Simon <mail@meain.io>
Date: Fri, 10 May 2024 20:35:00 +0530
Subject: [PATCH] [zsh] use sh trap to ensure popd always happens

---
 zsh/.config/zsh/functions | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zsh/.config/zsh/functions b/zsh/.config/zsh/functions
index 39cf28df..cd74b051 100755
--- a/zsh/.config/zsh/functions
+++ b/zsh/.config/zsh/functions
@@ -90,8 +90,10 @@ q() {
 
 m() {
     r >/dev/null
+
+    trap popd>/dev/null 1 2 3 6
+
     if [ ! -d .mscripts ]; then
-        popd >/dev/null
         echo "Unable to find .mscripts" && return 1
     fi
     script="$1"
@@ -100,22 +102,21 @@ m() {
 
     if [ -z "$mscript" ]; then
         echo "No mscript avaialble for $script"
-        popd >/dev/null
         return 1
     fi
 
     eval .mscripts/"$mscript" $*
-    popd >/dev/null
 }
 
 mm() {
     r >/dev/null
+    trap popd>/dev/null 1 2 3 6
+
     if [ ! -f .mscripts/default ]; then
         echo "Unable to find default mscript" && return 1
     fi
 
     .mscripts/default "$@"
-    popd >/dev/null
 }
 
 # python venv setup (need to be function as we have to source)