Skip to content

Commit

Permalink
chore: use brew install script
Browse files Browse the repository at this point in the history
  • Loading branch information
m2Giles committed May 13, 2024
1 parent 8b212c8 commit 4496b90
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY /system_files/shared/usr/etc/ublue-update/ublue-update.toml /tmp/ublue-upda
# Copy Bluefin CLI packages
COPY --from=bluefin-cli /usr/bin/atuin /usr/bin/atuin
COPY --from=bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec
COPY --from=bluefin-cli /home/homebrew /usr/share/homebrew
# COPY --from=bluefin-cli /home/homebrew /usr/share/homebrew
# COPY ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=akmods /rpms /tmp/akmods-rpms

Expand Down
23 changes: 23 additions & 0 deletions build_files/base/brew.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/bash

set -xeou pipefail

curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh > /tmp/brew.sh
chmod +x /tmp/brew.sh

# Convince the installer we are in CI
if [[ ! -f /.dockerenv ]]; then
touch /.dockerenv
fi

# Make these so script will work
mkdir -p /var/home
mkdir -p /var/roothome

# Install brew, Get portable Ruby
/tmp/brew.sh
/home/linuxbrew/.linuxbrew/bin/brew update

# Copy to image and own by UID 1000
cp -R /home/linuxbrew /usr/share/homebrew
chown -R 1000:1000 /usr/share/homebrew
1 change: 1 addition & 0 deletions build_files/base/build-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set -ouex pipefail
. /tmp/build/nvidia.sh
. /tmp/build/image-info.sh
. /tmp/build/fetch-install.sh
. /tmp/build/brew.sh
. /tmp/build/fetch-quadlets.sh
. /tmp/build/font-install.sh
. /tmp/build/systemd.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ After=cleanup-homebrew.service
After=var-mount.mount
ConditionPathIsDirectory=%S/homebrew
ConditionPathIsDirectory=%C/homebrew
ConditionPathExists=!/var/home/linuxbrew/.linuxbrew

[Mount]
Type=overlay
Expand Down

0 comments on commit 4496b90

Please sign in to comment.