fish: Adjust dev_img functions

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

configs/tmux/start-distrobox.fish

@@ -1,5 +1,5 @@
 #!/usr/bin/env fish
 
 in_container_msg -h; or return
-dbx list &| grep -q (get_dev_img); or dbxc --yes; or return
+dbx list &| grep -q (dev_img); or dbxc --yes; or return
 dbxe -- true

fish/functions/dbxc.fish

@@ -54,8 +54,8 @@ 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 (get_dev_img_esc)
+        set img (dev_img_gh)
+        set name (dev_img)
     end
 
     set -a dbx_args -i $img
@@ -77,7 +77,7 @@ function dbxc -d "Shorthand for 'distrobox create'"
     # If we are using a development image AND it is the default one for our
     # architecture (to avoid weird dynamic linking failures), use the binaries
     # in $CBL by default
-    if test "$img" = $GHCR/(get_dev_img); and not set -q skip_cbl
+    if test "$img" = (dev_img_gh); and not set -q skip_cbl
         set -a add_args --env=USE_CBL=1
     end
 

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 (get_dev_img_esc)
+        set dbx_img (dev_img)
     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_esc)
+        set targets (dev_img)
     else
         set targets $argv
     end

fish/functions/get_dev_img.fish → fish/functions/dev_img.fish

@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2022-2023 Nathan Chancellor
 
-function get_dev_img -d "Print the default development container image for the host architecture"
+function dev_img -d "Print the default development container image for the host architecture"
     switch (uname -m)
         case 'armv7*' i686
-            echo dev/suse
+            echo dev-suse
         case aarch64
-            echo dev/fedora
+            echo dev-fedora
         case x86_64
-            echo dev/arch
+            echo dev-arch
     end
 end

fish/functions/dev_img_gh.fish

@@ -0,0 +1,7 @@
+#!/usr/bin/env fish
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2024 Nathan Chancellor
+
+function dev_img_gh -d "Get the default development image from the GitHub Container Registry"
+    echo $GHCR/(dev_img | string replace - /)
+end

fish/functions/oci_bld.fish

@@ -39,7 +39,7 @@ function oci_bld -d "Build an OCI container image"
     for image in $images
         switch $image
             case dev
-                set folder (get_dev_img)
+                set folder (dev_img | string replace - /)
                 set image $folder
 
             case '*'

fish/functions/upd.fish

@@ -81,7 +81,7 @@ function upd -d "Runs the update command for the current distro or downloads/upd
 
             case os os-no-container
                 $PYTHON_SCRIPTS_FOLDER/upd_distro.py $yes
-                if test "$target" != os-no-container; and has_container_manager; and dbx list &| grep -q (get_dev_img_esc)
+                if test "$target" != os-no-container; and has_container_manager; and dbx list &| grep -q (dev_img)
                     dbxe -- $PYTHON_SCRIPTS_FOLDER/upd_distro.py $yes
                 end
                 if command -q mac