From c48b67eed0d96bab7bb7f98fae852c58cce8876c Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Thu, 19 Sep 2024 17:17:50 -0400 Subject: [PATCH 1/3] fix(just): remove brew shortcuts This stuff is on the image now. --- build/ublue-os-just/05-brew.just | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 build/ublue-os-just/05-brew.just diff --git a/build/ublue-os-just/05-brew.just b/build/ublue-os-just/05-brew.just deleted file mode 100644 index e21cb219..00000000 --- a/build/ublue-os-just/05-brew.just +++ /dev/null @@ -1,30 +0,0 @@ -alias brew := install-brew - -# Install Homebrew | https://brew.sh -install-brew: - #!/usr/bin/env bash - source /usr/lib/ujust/ujust.sh - if [[ ! -f "/var/home/linuxbrew/.linuxbrew/bin" || ! -x "/var/home/linuxbrew/.linuxbrew/bin/brew" ]]; then - echo "${b}Brew Installation${n}" - echo "Please ${b}IGNORE${n} everything the installer tells you to do at the end" - echo "We have already done it for you! You just need to close and re-open the terminal after installation" - echo "Do you understand?" - echo "Please type in \"YES I UNDERSTAND\" and press enter" - read ACCEPT - if [ "$ACCEPT" == "YES I UNDERSTAND" ]; then - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - else - echo "Capitalization matters when you type \"YES I UNDERSTAND\"" - fi - fi - # if /etc/profile.d/brew.sh already exists, replace it with /usr/etc/profile.d/brew.sh - if [ -f /etc/profile.d/brew.sh ]; then - if [ -f /usr/etc/profile.d/brew.sh ]; then - sudo cp /usr/etc/profile.d/brew.sh /etc/profile.d/brew.sh - fi - fi - -# Removes homebrew from system -remove-brew: - echo "Removing homebrew ..." - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)" From f5d78a484c1e14873e67142ac415a80d586b9986 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 20 Sep 2024 12:31:51 -0700 Subject: [PATCH 2/3] fix: remove old brew file from spec file --- build/ublue-os-just/ublue-os-just.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/build/ublue-os-just/ublue-os-just.spec b/build/ublue-os-just/ublue-os-just.spec index f6dcbcee..80b4077e 100644 --- a/build/ublue-os-just/ublue-os-just.spec +++ b/build/ublue-os-just/ublue-os-just.spec @@ -37,7 +37,6 @@ Source21: toolbox.ini Source22: 31-toolbox.just Source23: brew.sh Source24: 15-ublue-config.md -Source25: 05-brew.just %global sub_name %{lua:t=string.gsub(rpm.expand("%{NAME}"), "^ublue%-os%-", ""); print(t)} From e93a509ccd2e631aeb3493a839d3a917f31bf449 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 20 Sep 2024 12:58:10 -0700 Subject: [PATCH 3/3] chore: Fix missing source, update to version 0.36 --- build/ublue-os-just/ublue-os-just.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/ublue-os-just/ublue-os-just.spec b/build/ublue-os-just/ublue-os-just.spec index 80b4077e..3ffce999 100644 --- a/build/ublue-os-just/ublue-os-just.spec +++ b/build/ublue-os-just/ublue-os-just.spec @@ -1,7 +1,7 @@ Name: ublue-os-just Packager: ublue-os Vendor: ublue-os -Version: 0.35 +Version: 0.36 Release: 1%{?dist} Summary: ublue-os just integration License: MIT @@ -52,7 +52,7 @@ mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR}/%{sub_name} install -Dm755 %{SOURCE0} %{buildroot}%{_sysconfdir}/profile.d/ublue-os-just.sh install -Dm755 %{SOURCE19} %{buildroot}%{_sysconfdir}/profile.d/user-motd.sh install -Dm755 %{SOURCE23} %{buildroot}%{_sysconfdir}/profile.d/brew.sh -cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE22} %{SOURCE25} %{buildroot}%{_datadir}/%{VENDOR}/%{sub_name} +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE22} %{buildroot}%{_datadir}/%{VENDOR}/%{sub_name} mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR}/motd/tips cp %{SOURCE24} %{buildroot}%{_datadir}/%{VENDOR}/motd/tips @@ -108,6 +108,9 @@ just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > %{_datadir}/bash- chmod 644 %{_datadir}/bash-completion/completions/ujust %changelog +* Fri Sep 20 2024 Kyle Gospodnetich - 0.36 +- Remove no longer needed brew commands, now on image + * Fri May 31 2024 HikariKnight <2557889+HikariKnight@users.noreply.github.com> - 0.35 - Make toggle-updates smarter and detect if ublue-update is installed