Reindent and stricter fail checking in editor picker

Author: ChillerDragon

lib/include/common.sh

@@ -1,40 +1,45 @@
 #!/bin/bash
 
 function echo_arr() {
-    local i
-    for i in "$@"
-    do
-        echo "$i"
-    done
+	local i
+	for i in "$@"
+	do
+		echo "$i"
+	done
+}
+
+function run_cmd() {
+	local cmd="$1"
+	bash -c "set -euo pipefail;$cmd" || { err "failed to run '$cmd'"; }
 }
 
 function fzf_select() {
-    # usage: fzf_select prompt callback options.."
-    # example: fzf_select "pick a foo" my_callback foo bar baz
-    local prompt="$1"
-    local callback="$2"
-    local choice
-    local o
-    shift
-    shift
-    if [ -x "$(command -v fzf)" ]
-    then
-        choice="$(echo_arr "$@" | fzf)"
-        eval "$callback $choice"
-    else
-        PS3="$prompt"
-        select choice in "$@"
-        do
-            for o in "$@"
-            do
-                if [[ "$o" == "$choice" ]]
-                then
-                    eval "$callback $choice"
-                    return
-                fi
-            done
-            echo "invalid option $REPLY"
-        done
-    fi
+	# usage: fzf_select prompt callback options.."
+	# example: fzf_select "pick a foo" my_callback foo bar baz
+	local prompt="$1"
+	local callback="$2"
+	local choice
+	local o
+	shift
+	shift
+	if [ -x "$(command -v fzf)" ]
+	then
+		choice="$(echo_arr "$@" | fzf)"
+		run_cmd "$callback $choice"
+	else
+		PS3="$prompt"
+		select choice in "$@"
+		do
+			for o in "$@"
+			do
+				if [[ "$o" == "$choice" ]]
+				then
+					run_cmd "$callback $choice"
+					return
+				fi
+			done
+			echo "invalid option $REPLY"
+		done
+	fi
 }
 

lib/include/editor.sh

@@ -3,7 +3,7 @@
 function callback_editor() {
     local file="$1"
     local _editor="$2"
-    eval "$_editor $file"
+    bash -c "set -euo pipefail;$_editor $file" || { err "failed to open editor"; }
 }
 
 function edit_file() {
@@ -18,7 +18,7 @@ function edit_file() {
     fi
     if [ "$selected_editor" != "" ]
     then
-        eval "$selected_editor $file"
+        bash -c "set -euo pipefail;$selected_editor $file" || { err "failed to open editor"; }
         return
     fi
     fzf_select \