fish: Fix updating distrobox container with upd

Introduce get_dev_img_esc() and use in more places, including upd to
look for the name of the container, rather than the image (because the
tag could disappear).

Signed-off-by: Nathan Chancellor <[email protected]>

fish/functions/dbxc.fish

@@ -55,7 +55,7 @@ function dbxc -d "Shorthand for 'distrobox create'"
     # If no image was specified, default to the one for the architecture
     if not set -q img
         set img $GHCR/(get_dev_img)
-        set name (string replace / - (get_dev_img))
+        set name (get_dev_img_esc)
     end
 
     set -a dbx_args -i $img

fish/functions/dbxe.fish

@@ -29,7 +29,7 @@ function dbxe -d "Shorthand for 'distrobox enter'"
     end
 
     if not set -q dbx_img
-        set dbx_img (string replace / - (get_dev_img))
+        set dbx_img (get_dev_img_esc)
     end
 
     if test (count $add_args) -gt 0

fish/functions/dbxr.fish

@@ -4,7 +4,7 @@
 
 function dbxr -d "Remove a distrobox container"
     if test (count $argv) -eq 0
-        set targets (get_dev_img | string replace / -)
+        set targets (get_dev_img_esc)
     else
         set targets $argv
     end

fish/functions/get_dev_img_esc.fish

@@ -0,0 +1,7 @@
+#!/usr/bin/env fish
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2023 Nathan Chancellor
+
+function get_dev_img_esc -d "Replace '/' in value from get_dev_img() with '-'"
+    string replace / - (get_dev_img)
+end

fish/functions/upd.fish

@@ -108,7 +108,7 @@ function upd -d "Runs the update command for the current distro or downloads/upd
                         print_error "Unknown OS! Cannot upgrade using 'upd'. Modify 'get_distro' to support this distro."
                         return 1
                 end
-                if has_container_manager; and dbx list &| grep -q (get_dev_img)
+                if has_container_manager; and dbx list &| grep -q (get_dev_img_esc)
                     dbxe -- "fish -c 'upd -y'"
                 end
                 if command -q mac