From 5fec87d324fca37605ffd2434922052b218967b4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 15:24:18 +0200 Subject: [PATCH] Get rid of -Sy and -Syy (#1175) * Get rid of -Sy and -Syy * Get rid of all naked -Sy usage * Don't need a full system update for this * Combine * Does not need a full system update * Need to refresh even just for Omarchy repository * Does not warrant a full system update * No longer need the sudoless pacman runs * We have already added the Omarchy repo before getting to here So fine to just do a straight install --- bin/omarchy-install-dev-env | 2 +- bin/omarchy-install-steam | 3 +-- bin/omarchy-menu | 10 +++++----- bin/omarchy-pkg-aur-install | 2 +- bin/omarchy-pkg-install | 3 +-- boot.sh | 2 +- install/config/hardware/nvidia.sh | 2 +- install/preflight/repositories.sh | 12 +++--------- migrations/1751134561.sh | 2 +- migrations/1752091783.sh | 2 +- migrations/1752981883.sh | 2 +- migrations/1753352057.sh | 2 +- migrations/1754509222.sh | 2 +- migrations/1754515289.sh | 2 +- migrations/1755164105.sh | 2 +- migrations/1755795450.sh | 2 +- migrations/1756103168.sh | 6 ------ migrations/1756300740.sh | 3 +++ 18 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 migrations/1756103168.sh create mode 100644 migrations/1756300740.sh diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env index 1e8480ac..5453e8d5 100755 --- a/bin/omarchy-install-dev-env +++ b/bin/omarchy-install-dev-env @@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then fi install_php() { - sudo pacman -Sy php composer php-sqlite --noconfirm + sudo pacman -S php composer php-sqlite --noconfirm # Install Path for Composer if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then diff --git a/bin/omarchy-install-steam b/bin/omarchy-install-steam index 9eb826db..9903feb7 100755 --- a/bin/omarchy-install-steam +++ b/bin/omarchy-install-steam @@ -2,8 +2,7 @@ echo "Adding multilib repository for 32-bit compatibility" sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf -sudo pacman -Sy echo "Now pick dependencies matching your graphics card" -sudo pacman -S steam +sudo pacman -Syu steam setsid gtk-launch steam >/dev/null 2>&1 & diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 8569d185..ce94bae1 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -35,23 +35,23 @@ edit_in_nvim() { } install() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2" } install_and_launch() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3" } install_font() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" } aur_install() { - present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2" + present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2" } aur_install_and_launch() { - present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3" } show_learn_menu() { diff --git a/bin/omarchy-pkg-aur-install b/bin/omarchy-pkg-aur-install index 25aff21f..c99ee714 100755 --- a/bin/omarchy-pkg-aur-install +++ b/bin/omarchy-pkg-aur-install @@ -18,7 +18,7 @@ pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}") if [[ -n "$pkg_names" ]]; then # Convert newline-separated selections to space-separated for yay - echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm + echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm sudo updatedb omarchy-show-done fi diff --git a/bin/omarchy-pkg-install b/bin/omarchy-pkg-install index 7f861063..8a6c1ce6 100755 --- a/bin/omarchy-pkg-install +++ b/bin/omarchy-pkg-install @@ -14,12 +14,11 @@ fzf_args=( --color 'pointer:green,marker:green' ) -sudo pacman -Sy pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}") if [[ -n "$pkg_names" ]]; then # Convert newline-separated selections to space-separated for yay - echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm + echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm sudo updatedb omarchy-show-done fi diff --git a/boot.sh b/boot.sh index 17ad668f..98df4e43 100755 --- a/boot.sh +++ b/boot.sh @@ -14,7 +14,7 @@ ansi_art=' ▄▄▄ clear echo -e "\n$ansi_art\n" -sudo pacman -Sy --noconfirm --needed git +sudo pacman -Syu --noconfirm --needed git # Use custom repo if specified, otherwise default to basecamp/omarchy OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}" diff --git a/install/config/hardware/nvidia.sh b/install/config/hardware/nvidia.sh index 6623de60..65f3f04b 100755 --- a/install/config/hardware/nvidia.sh +++ b/install/config/hardware/nvidia.sh @@ -36,7 +36,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then fi # force package database refresh - sudo pacman -Syy + sudo pacman -Syu # Install packages PACKAGES_TO_INSTALL=( diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh index 59c18f3e..f3e6ba7d 100755 --- a/install/preflight/repositories.sh +++ b/install/preflight/repositories.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install build tools -sudo pacman -Sy --needed --noconfirm base-devel +sudo pacman -S --needed --noconfirm base-devel # Add fun and color and verbosity to the pacman installer if ! grep -q "ILoveCandy" /etc/pacman.conf; then @@ -30,16 +30,10 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then if ! grep -q "chaotic-aur" /etc/pacman.conf; then echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null fi - - # Refresh all repos - sudo pacman -Sy else echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!" fi fi -# Allow repository index updates without sudo -sudo tee /etc/sudoers.d/repositories >/dev/null </dev/null; then - sudo pacman -Sy --noconfirm --needed walker-bin libqalculate + sudo pacman -S --noconfirm --needed walker-bin libqalculate sudo pacman -Rns --noconfirm wofi rm -rf ~/.config/wofi diff --git a/migrations/1753352057.sh b/migrations/1753352057.sh index 3c3b9157..7cd33beb 100755 --- a/migrations/1753352057.sh +++ b/migrations/1753352057.sh @@ -11,7 +11,7 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null # Refresh pacman package databases - sudo pacman -Sy + sudo pacman -Syu else echo "Failed to install Chaotic-AUR, so won't include it in pacman config!" fi diff --git a/migrations/1754509222.sh b/migrations/1754509222.sh index 8ad7ad45..ced63c6d 100644 --- a/migrations/1754509222.sh +++ b/migrations/1754509222.sh @@ -1,3 +1,3 @@ echo "Add xmlstarlet needed for updating fonts via Omarchy menu" -sudo pacman -Sy --noconfirm --needed xmlstarlet +sudo pacman -S --noconfirm --needed xmlstarlet diff --git a/migrations/1754515289.sh b/migrations/1754515289.sh index 17a3d565..23f4db5e 100644 --- a/migrations/1754515289.sh +++ b/migrations/1754515289.sh @@ -1,4 +1,4 @@ echo "Update and restart Walker to resolve stuck Omarchy menu" -sudo pacman -Sy --noconfirm walker-bin +sudo pacman -Syu --noconfirm walker-bin omarchy-restart-walker diff --git a/migrations/1755164105.sh b/migrations/1755164105.sh index 17dd2a71..a17ac587 100644 --- a/migrations/1755164105.sh +++ b/migrations/1755164105.sh @@ -11,7 +11,7 @@ set_theme_colors() { if command -v chromium &>/dev/null; then sudo pacman -Rns --noconfirm chromium || true - sudo pacman -Sy --noconfirm omarchy-chromium + sudo pacman -S --noconfirm omarchy-chromium if pgrep -x chromium; then if gum confirm "Chromium must be restarted. Ready?"; then diff --git a/migrations/1755795450.sh b/migrations/1755795450.sh index 96df3fcd..3e2b3e64 100644 --- a/migrations/1755795450.sh +++ b/migrations/1755795450.sh @@ -1,3 +1,3 @@ echo "Ensure latest uwsm is installed" -sudo pacman -Sy --noconfirm uwsm +sudo pacman -Syu --noconfirm uwsm diff --git a/migrations/1756103168.sh b/migrations/1756103168.sh deleted file mode 100644 index bef59f4e..00000000 --- a/migrations/1756103168.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Allow pacman -Sy without sudo to easier installs" - -sudo tee /etc/sudoers.d/repositories >/dev/null <