Merge branch 'bash-fn' of https://github.com/vladimyr/broot into vladimyr-bash-fn

1 files changed, 10 insertions, 16 deletions

diff --git a/src/shell_install/bash.rs b/src/shell_install/bash.rs
index 249172c..00cd268 100644
--- a/src/shell_install/bash.rs
+++ b/src/shell_install/bash.rs
@@ -38,23 +38,17 @@ const BASH_FUNC: &str = r#"
 # It's needed because some shell commands, like `cd`,
 # have no useful effect if executed in a subshell.
 function br {
-    f=$(mktemp)
-    (
-	set +e
-	broot --outcmd "$f" "$@"
-	code=$?
-	if [ "$code" != 0 ]; then
-	    rm -f "$f"
-	    exit "$code"
-	fi
-    )
-    code=$?
-    if [ "$code" != 0 ]; then
-	return "$code"
+    local cmd cmd_file code
+    cmd_file=$(mktemp)
+    if broot --outcmd "$cmd_file" "$@"; then
+        cmd=$(<"$cmd_file")
+        rm -f "$cmd_file"
+        eval "$cmd"
+    else
+        code=$?
+        rm -f "$cmd_file"
+        return "$code"
     fi
-    d=$(<"$f")
-    rm -f "$f"
-    eval "$d"
 }
 "#;