From 52c335f6fd894dabbb5b78201b282c47b8d5cbb8 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <nathan@kernel.org>
Date: Sat, 21 Dec 2024 19:51:07 -0700
Subject: [PATCH] fish: Adjust dev_img functions

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 configs/tmux/start-distrobox.fish                 | 2 +-
 fish/functions/dbxc.fish                          | 6 +++---
 fish/functions/dbxe.fish                          | 2 +-
 fish/functions/dbxr.fish                          | 2 +-
 fish/functions/{get_dev_img.fish => dev_img.fish} | 8 ++++----
 fish/functions/dev_img_gh.fish                    | 7 +++++++
 fish/functions/get_dev_img_esc.fish               | 7 -------
 fish/functions/oci_bld.fish                       | 2 +-
 fish/functions/upd.fish                           | 2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)
 rename fish/functions/{get_dev_img.fish => dev_img.fish} (52%)
 create mode 100644 fish/functions/dev_img_gh.fish
 delete mode 100644 fish/functions/get_dev_img_esc.fish

diff --git a/configs/tmux/start-distrobox.fish b/configs/tmux/start-distrobox.fish
index 38e73a462..48dab27c3 100755
--- a/configs/tmux/start-distrobox.fish
+++ b/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
diff --git a/fish/functions/dbxc.fish b/fish/functions/dbxc.fish
index 555a2454a..bf23a6743 100644
--- a/fish/functions/dbxc.fish
+++ b/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
 
diff --git a/fish/functions/dbxe.fish b/fish/functions/dbxe.fish
index 7d883e324..409f17253 100644
--- a/fish/functions/dbxe.fish
+++ b/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
diff --git a/fish/functions/dbxr.fish b/fish/functions/dbxr.fish
index c95046e2c..4ca046a78 100644
--- a/fish/functions/dbxr.fish
+++ b/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
diff --git a/fish/functions/get_dev_img.fish b/fish/functions/dev_img.fish
similarity index 52%
rename from fish/functions/get_dev_img.fish
rename to fish/functions/dev_img.fish
index 70a1074a5..bb343122a 100644
--- a/fish/functions/get_dev_img.fish
+++ b/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
diff --git a/fish/functions/dev_img_gh.fish b/fish/functions/dev_img_gh.fish
new file mode 100644
index 000000000..bcc44d777
--- /dev/null
+++ b/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
diff --git a/fish/functions/get_dev_img_esc.fish b/fish/functions/get_dev_img_esc.fish
deleted file mode 100644
index 85e8d4e99..000000000
--- a/fish/functions/get_dev_img_esc.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
diff --git a/fish/functions/oci_bld.fish b/fish/functions/oci_bld.fish
index 43ccb2847..3a6018e72 100644
--- a/fish/functions/oci_bld.fish
+++ b/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 '*'
diff --git a/fish/functions/upd.fish b/fish/functions/upd.fish
index 196880b97..b90494f55 100644
--- a/fish/functions/upd.fish
+++ b/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