fix arch errors

This commit is contained in:
Anton Volnuhin 2024-05-21 19:19:55 +03:00
parent 4f9606d0f5
commit d4a810a11d

View File

@ -4,7 +4,7 @@ STEPS=16
PAD_LEN=4 PAD_LEN=4
BASE_PACKAGES="gnupg curl wget git direnv" 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 #Colors
Green='\033[0;32m' # Green Green='\033[0;32m' # Green
@ -38,9 +38,6 @@ $Green""########################################################################
###############################################################################$NC ###############################################################################$NC
" "
echo "OS: {{.chezmoi.os}}"
echo "ID: {{.chezmoi.osRelease.id}}"
read 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 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" -}} {{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}
set -x
sudo pacman -Syu --noconfirm 2>&1|pad sudo pacman -Syu --noconfirm 2>&1|pad
{{ end -}} {{ end -}}
@ -129,13 +125,13 @@ set -x
new_line "Install base packages" new_line "Install base packages"
{{ if eq .chezmoi.os "darwin" -}} {{ 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" -}} {{ 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" -}} {{ 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 sudo apt-get install software-properties-common -y 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}} {{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}