chore: use ublue-bling package for bluefin-cli functionality (#2134)

ublue-os · Jan 12, 2025 · 0ec97db · 0ec97db
1 parent 093b9ef
commit 0ec97db
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 227 deletions.
diff --git a/build_files/base/18-workarounds.sh b/build_files/base/18-workarounds.sh
@@ -19,4 +19,8 @@ fi
 #    rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2024-dd2e9fb225
 #fi
 
+# Current bluefin systems have the bling.sh and bling.fish in their default locations
+mkdir -p /usr/share/ublue-os/bluefin-cli
+cp /usr/share/ublue-os/bling/* /usr/share/ublue-os/bluefin-cli
+
 echo "::endgroup::"
diff --git a/just/bluefin-system.just b/just/bluefin-system.just
@@ -22,7 +22,7 @@ benchmark:
 # Configure Bluefin-CLI Terminal Experience with Brew
 [group('System')]
 bluefin-cli:
-    @/usr/libexec/ublue-bling.sh
+    @/usr/libexec/ublue-bling
 
 # alias for toggle-devmode
 devmode:

diff --git a/packages.json b/packages.json
@@ -59,6 +59,7 @@
 				"tmux",
 				"ublue-motd",
 				"usbmuxd",
+				"ublue-bling",
 				"wireguard-tools",
 				"xprop",
 				"wl-clipboard",

diff --git a/system_files/shared/etc/ublue-os/bling.json b/system_files/shared/etc/ublue-os/bling.json
@@ -0,0 +1,3 @@
+{
+  "bling-cli-name": "bluefin-cli"
+}
diff --git a/system_files/shared/usr/libexec/ublue-bling.sh b/system_files/shared/usr/libexec/ublue-bling.sh
diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.fish b/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.fish
diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.sh b/system_files/shared/usr/share/ublue-os/bluefin-cli/bling.sh