Improve error handling

fish-shell · May 1, 2021 · a25ebdd · a25ebdd
1 parent 238bbb6
commit a25ebdd
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
@@ -98,8 +98,20 @@ function fish_config --description "Launch fish's web based configuration"
                 echo Overwriting
                 cp $__fish_config_dir/functions/fish_prompt.fish{,.bak}
 
-                set -q argv[1]
-                and source $prompt_dir/$argv[1].fish
+                if set -q argv[1]
+                    set -l have 0
+                    for f in $prompt_dir/$argv[1].fish
+                        if test -f $f
+                            set have 1
+                            source $f
+                            or return 2
+                        end
+                    end
+                    if test $have -eq 0
+                        echo "No such prompt: '$argv[1]'" >&2
+                        return 1
+                    end
+                end
 
                 funcsave fish_prompt
                 or return