feat: Use ujust to install brew (#956)

Co-authored-by: Brian Ketelsen <[email protected]>

Containerfile

@@ -100,9 +100,8 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     systemctl enable dconf-update.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
-    systemctl enable ublue-system-networked-tasks.service && \
-    systemctl enable brew-install-workaround.service && \
-    systemctl --global enable ublue-user-networked-tasks.service && \
+    systemctl enable ublue-system-flatpak-manager.service && \
+    systemctl --global enable ublue-user-flatpak-manager.service && \
     systemctl --global enable ublue-user-setup.service && \
     fc-cache -f /usr/share/fonts/ubuntu && \
     fc-cache -f /usr/share/fonts/inter && \

usr/lib/systemd/system/ublue-system-networked-tasks.service → usr/lib/systemd/system/ublue-system-flatpak-manager.service

@@ -1,12 +1,12 @@
 [Unit]
-Description=Manage tasks that require network access (Flatpaks)
+Description=Manage system flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
 After=network-online.target ublue-system-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/ublue-system-networked-tasks
+ExecStart=/usr/libexec/ublue-system-flatpak-manager
 Restart=on-failure
 RestartSec=30
 StartLimitInterval=0

usr/lib/systemd/user/ublue-user-networked-tasks.service → usr/lib/systemd/user/ublue-user-flatpak-manager.service

@@ -1,12 +1,12 @@
 [Unit]
-Description=Manage user activities that require network access (Flatpaks, Brew)
+Description=Manage user flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
 After=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/ublue-user-networked-tasks
+ExecStart=/usr/libexec/ublue-user-flatpak-manager
 Restart=on-failure
 RestartSec=30
 StartLimitInterval=0

usr/libexec/configure-terminal.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 # shellcheck source=/dev/null
 source /usr/lib/ujust/ujust.sh
 

usr/libexec/ublue-system-networked-tasks → usr/libexec/ublue-system-flatpak-manager

@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # Script Version
 VER=3
-VER_FILE="/etc/ublue/networked_tasks_version"
+VER_FILE="/etc/ublue/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 
 # Run script if updated
 if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
-  echo "Networked tasks v$VER has already ran. Exiting..."
+  echo "Flatpak manager v$VER has already ran. Exiting..."
   exit 0
 fi
 

usr/libexec/ublue-system-setup

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)

usr/libexec/ublue-user-networked-tasks → usr/libexec/ublue-user-flatpak-manager

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # Script Version
 VER=5
-VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/networked_tasks_version"
+VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 
 mkdir -p "$(dirname "$VER_FILE")" || exit 1
@@ -50,11 +50,4 @@ fi
 
 notify-send "Flatpak installer" "Finished installing user flatpaks" --app-name="Flatpak installer" -u NORMAL
 
-# Install brew
-if [[ ! -f "/var/home/linuxbrew/.linuxbrew/bin" || ! -x "/var/home/linuxbrew/.linuxbrew/bin/brew" ]]; then
-  /usr/bin/bash -c 'env NONINTERACTIVE=1 /usr/libexec/brew-install'
-fi
-
-notify-send "Brew installer" "Finished installing brew package manager" --app-name="Brew installer" -u NORMAL
-
 echo $VER > $VER_FILE

usr/libexec/ublue-user-setup

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # SCRIPT VERSION
 USER_SETUP_VER=5