itsscb/omarchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate pacman setup from aur and make aur optional

Browse Source
This commit is contained in:
David Heinemeier Hansson 2025-08-24 17:20:13 +02:00
parent 09a90e3cf2
commit 664fb7c51a
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install.sh
View File

@ -23,6 +23,7 @@ source $OMARCHY_INSTALL/preflight/trap-errors.sh
source $OMARCHY_INSTALL/preflight/chroot.sh source $OMARCHY_INSTALL/preflight/chroot.sh
source $OMARCHY_INSTALL/preflight/mirrorlist.sh source $OMARCHY_INSTALL/preflight/mirrorlist.sh
source $OMARCHY_INSTALL/preflight/guard.sh source $OMARCHY_INSTALL/preflight/guard.sh
source $OMARCHY_INSTALL/preflight/pacman.sh
source $OMARCHY_INSTALL/preflight/aur.sh source $OMARCHY_INSTALL/preflight/aur.sh
source $OMARCHY_INSTALL/preflight/migrations.sh source $OMARCHY_INSTALL/preflight/migrations.sh

32
install/preflight/aur.sh
View File

@ -3,9 +3,6 @@
# Install build tools # Install build tools
sudo pacman -Sy --needed --noconfirm base-devel jq sudo pacman -Sy --needed --noconfirm base-devel jq
# Ensure package repositories are accessible before proceeding
omarchy-pkg-repos-accessible
# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages # Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v yay &>/dev/null; then if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v yay &>/dev/null; then
# Try installing Chaotic-AUR keyring and mirrorlist # Try installing Chaotic-AUR keyring and mirrorlist
@ -25,21 +22,16 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v
else else
echo "Failed to install Chaotic-AUR, so won't include it in pacman config!" echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
fi fi
fi else
# Manually install yay from AUR if not already available
# Manually install yay from AUR if not already available if ! command -v yay &>/dev/null; then
if ! command -v yay &>/dev/null; then cd /tmp
cd /tmp rm -rf yay-bin
rm -rf yay-bin git clone https://aur.archlinux.org/yay-bin.git
git clone https://aur.archlinux.org/yay-bin.git cd yay-bin
cd yay-bin makepkg -si --noconfirm
makepkg -si --noconfirm cd -
cd - rm -rf yay-bin
rm -rf yay-bin cd ~
cd ~ fi
fi
# Add fun and color and verbosity to the pacman installer
if ! grep -q "ILoveCandy" /etc/pacman.conf; then
sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
fi fi

9
install/preflight/pacman.sh Normal file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# Install build tools
sudo pacman -Sy --needed --noconfirm base-devel jq
# Add fun and color and verbosity to the pacman installer
if ! grep -q "ILoveCandy" /etc/pacman.conf; then
sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
fi