From d4a810a11d7c64a7bd7a8e290599cf23c9bf6481 Mon Sep 17 00:00:00 2001 From: Anton Volnuhin Date: Tue, 21 May 2024 19:19:55 +0300 Subject: [PATCH] fix arch errors --- run_onchange_after_install_main_deps.sh.tmpl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/run_onchange_after_install_main_deps.sh.tmpl b/run_onchange_after_install_main_deps.sh.tmpl index 035bb6a..dfa455e 100644 --- a/run_onchange_after_install_main_deps.sh.tmpl +++ b/run_onchange_after_install_main_deps.sh.tmpl @@ -4,7 +4,7 @@ STEPS=16 PAD_LEN=4 BASE_PACKAGES="gnupg curl wget git direnv" -ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr pipx gcc" +ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr gcc" #Colors Green='\033[0;32m' # Green @@ -38,9 +38,6 @@ $Green""######################################################################## ###############################################################################$NC " -echo "OS: {{.chezmoi.os}}" -echo "ID: {{.chezmoi.osRelease.id}}" - read @@ -120,7 +117,6 @@ new_line "Update caches and upgrade packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -o "Dpkg::Options::=--force-confold" -o "Dpkg::Options::=--force-confdef" upgrade -y --allow-downgrades --allow-remove-essential --allow-change-held-packages 2>&1|pad {{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}} -set -x sudo pacman -Syu --noconfirm 2>&1|pad {{ end -}} @@ -129,13 +125,13 @@ set -x new_line "Install base packages" {{ if eq .chezmoi.os "darwin" -}} - brew install -q $BASE_PACKAGES python 2>&1|pad + brew install -q $BASE_PACKAGES python pipx 2>&1|pad {{ else if eq .chezmoi.osRelease.id "fedora" -}} - sudo dnf install $BASE_PACKAGES kitty-terminfo util-linux-user python3-pip -y 2>&1|pad + sudo dnf install $BASE_PACKAGES kitty-terminfo util-linux-user python3-pipx -y 2>&1|pad {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} - sudo apt-get install $BASE_PACKAGES kitty-terminfo direnv python3-pip python3-venv -y 2>&1|pad + sudo apt-get install $BASE_PACKAGES kitty-terminfo direnv python3-pipx python3-venv -y 2>&1|pad sudo apt-get install software-properties-common -y 2>&1|pad {{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}