chore: remove references to deprecated bluefin-cli container

ublue-os · Nov 7, 2024 · 864e9a2 · 864e9a2
1 parent 026206c
commit 864e9a2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 122 deletions.
diff --git a/build_files/base/06-fetch-quadlets.sh b/build_files/base/06-fetch-quadlets.sh
@@ -5,14 +5,6 @@ set -ouex pipefail
 # Make Directory
 mkdir -p /etc/containers/systemd/users
 
-# bluefin-cli
-curl -Lo /etc/containers/systemd/users/bluefin-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container
-sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /etc/containers/systemd/users/bluefin-cli.container
-
-# bluefin-dx-cli
-curl -Lo /etc/containers/systemd/users/bluefin-dx-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container
-sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /etc/containers/systemd/users/bluefin-dx-cli.container
-
 # fedora-toolbox
 curl -Lo /etc/containers/systemd/users/fedora-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
 sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /etc/containers/systemd/users/fedora-toolbox.container
@@ -36,8 +28,6 @@ printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/etc/profile.d/b
 # Make systemd targets
 mkdir -p /usr/lib/systemd/user
 QUADLET_TARGETS=(
-    "bluefin-cli"
-    "bluefin-dx-cli"
     "fedora-toolbox"
     "ubuntu-toolbox"
     "wolfi-toolbox"

diff --git a/just/bluefin-system.just b/just/bluefin-system.just
@@ -19,11 +19,6 @@ benchmark:
 bluefin-cli:
     @/usr/libexec/ublue-bling.sh
 
-# Configure Bluefin-CLI Terminal Experience
-[private]
-bluefin-cli-container:
-    @/usr/libexec/enable-bluefin-cli.sh
-
 # Configure Terminal Experience
 [private]
 configure-terminal:

diff --git a/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop b/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop
diff --git a/system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop b/system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop
diff --git a/system_files/shared/usr/libexec/configure-terminal.sh b/system_files/shared/usr/libexec/configure-terminal.sh
@@ -6,8 +6,6 @@ source /usr/lib/ujust/ujust.sh
 # List of possible containers
 ###
 targets=(
-    "bluefin-cli"
-    "bluefin-dx-cli"
     "fedora-toolbox"
     "ubuntu-toolbox"
     "wolfi-toolbox"
@@ -20,7 +18,7 @@ targets=(
 # shellcheck disable=SC2154
 function Exiting(){
     echo "${red}Exiting...${normal}"
-    echo "Rerun CLI setup using ${blue}ujust bluefin-cli${normal}..."
+    echo "Rerun setup using ${blue}ujust configure-terminal${normal}..."
     exit 0
 }
 function Good_Exit(){
@@ -211,7 +209,7 @@ function Build_container(){
 
 function main(){
     trap ctrl_c SIGINT
-    printf "Set Up bluefin-cli\n"
+    printf "Set up containers\n"
     Terminal_choice
     Make_container "$TERMINAL_CHOICE" 
     Container_manager

diff --git a/system_files/shared/usr/libexec/enable-bluefin-cli.sh b/system_files/shared/usr/libexec/enable-bluefin-cli.sh
diff --git a/system_files/shared/usr/libexec/ptyxis-create-profile.sh b/system_files/shared/usr/libexec/ptyxis-create-profile.sh
@@ -79,8 +79,6 @@ fi
 
 if test -n "$palette"; then
 	dconf write "${profile}palette" "'${palette}'"
-elif test "$name" = "bluefin-cli" || test "$name" = "bluefin-dx-cli"; then
-	dconf write "${profile}palette" "'catppuccin-dynamic'"
 elif test "$name" = "fedora-toolbox"; then
 	dconf write "${profile}palette" "'Elio'"
 elif test "$name" = "ubuntu-toolbox"; then

diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers b/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers
@@ -1,16 +1,12 @@
 # shellcheck shell=bash
 declare -Ar known_container=(
-    ["bluefin-cli"]="a21a910811504857bea4c96b3d937b93"
-    ["bluefin-dx-cli"]="276d25e6065b497b96dd57e4f95ff50a"
     ["fedora-toolbox"]="d6fe45489ed74fada5d95d715449ce7e"
     ["ubuntu-toolbox"]="4741cb2eb3614750b79edc5c4b8c08b3"
     ["wolfi-toolbox"]="33bd8e9953224e6985d8524e9b7294a1"
     ["wolfi-dx-toolbox"]="03d42eab38f740089cbe2fa5e2d6a374"
     ["Host"]="2871e8027773ae74d6c87a5f659bbc74"
 )
 declare -Ar known_guid=(
-    ["a21a910811504857bea4c96b3d937b93"]="bluefin-cli"
-    ["276d25e6065b497b96dd57e4f95ff50a"]="bluefin-dx-cli"
     ["d6fe45489ed74fada5d95d715449ce7e"]="fedora-toolbox"
     ["4741cb2eb3614750b79edc5c4b8c08b3"]="ubuntu-toolbox"
     ["33bd8e9953224e6985d8524e9b7294a1"]="wolfi-toolbox"