zias/omarchy
1
0
Fork 0
mirror of https://github.com/basecamp/omarchy.git synced 2026-02-17 15:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to a simple boolean

Browse Source
This commit is contained in:
David Heinemeier Hansson
2025-09-13 19:19:52 +02:00
parent beb2e6b865
commit 51607f1978
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boot.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Set install mode to online since boot.sh is used for curl installations # Set install mode to online since boot.sh is used for curl installations
export OMARCHY_INSTALL_MODE="online" export OMARCHY_ONLINE_INSTALL=true
ansi_art=' ▄▄▄ ansi_art=' ▄▄▄
▄█████▄ ▄███████████▄ ▄███████ ▄███████ ▄███████ ▄█ █▄ ▄█ █▄ ▄█████▄ ▄███████████▄ ▄███████ ▄███████ ▄███████ ▄█ █▄ ▄█ █▄

8
install/config/mise-ruby.sh
View File

@@ -14,12 +14,12 @@ if [[ $(uname -m) == "x86_64" ]]; then
mkdir -p "$MISE_RUBY_DIR" mkdir -p "$MISE_RUBY_DIR"
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "offline" ]]; then if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
echo "Installing Ruby from offline cache..."
tar -xzf "${OFFLINE_CACHE}/${RUBY_TARBALL}" -C "$MISE_RUBY_DIR"
else
echo "Downloading pre-built Ruby ${RUBY_VERSION}..." echo "Downloading pre-built Ruby ${RUBY_VERSION}..."
curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR" curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR"
else
echo "Installing Ruby from offline cache..."
tar -xzf "${OFFLINE_CACHE}/${RUBY_TARBALL}" -C "$MISE_RUBY_DIR"
fi fi
mise use --global "ruby@${RUBY_VERSION}" mise use --global "ruby@${RUBY_VERSION}"

2
install/helpers/errors.sh
View File

@@ -105,7 +105,7 @@ catch_errors() {
options=() options=()
# If online install, show retry first # If online install, show retry first
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
options+=("Retry installation") options+=("Retry installation")
fi fi

2
install/preflight/pacman.sh
View File

@@ -1,4 +1,4 @@
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
# Install build tools # Install build tools
sudo pacman -S --needed --noconfirm base-devel sudo pacman -S --needed --noconfirm base-devel

2
install/preflight/show-env.sh
View File

@@ -1,6 +1,6 @@
# Show installation environment variables # Show installation environment variables
gum log --level info "Installation Environment:" gum log --level info "Installation Environment:"
env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_INSTALL_MODE|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_ONLINE_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
gum log --level info " $var" gum log --level info " $var"
done done