diff --git a/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl index e11f449..a3bcd59 100644 --- a/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl @@ -25,23 +25,23 @@ packages=( {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} - log ">>>>> Begin Arch/Manjaro Linux packages installation <<<<<" + log "Begin Arch/Manjaro Linux packages installation" ## Update system inf "updating system..." {{- if ne .chezmoi.username "root" }} - sudo pacman -Syu --noconfirm + sudo pacman -Syu --noconfirm --quiet {{- else }} - pacman -Syu --noconfirm + pacman -Syu --noconfirm --quiet {{- end}} ## Install yay if [ ! $(command -v yay) ]; then inf "installing yay..." {{- if ne .chezmoi.username "root" }} - sudo pacman -S --needed --noconfirm git base-devel + sudo pacman -S --needed --noconfirm --quiet git base-devel {{- else}} - pacman -S --needed --noconfirm git base-devel + pacman -S --needed --noconfirm --quiet git base-devel {{- end }} git clone https://aur.archlinux.org/yay.git /tmp/yay cd /tmp/yay @@ -53,38 +53,38 @@ packages=( for package in ${packages[@]}; do if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then inf "installing ${package}..." - yay -S --noconfirm $package + yay -S --noconfirm --quiet $package fi done - log ">>>>> Finish Arch/Manjaro Linux packages installation <<<<<" + log "Finish Arch/Manjaro Linux packages installation" {{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}} - log ">>>>> Begin Debian/Ubuntu Linux packages installation <<<<<" + log "Begin Debian/Ubuntu Linux packages installation" DEBIAN_FRONTEND=noninteractive ## Add repositories and update system inf "updating system..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing lsb-release gpg + sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq lsb-release gpg curl -fsSL 'https://proget.makedeb.org/debian-feeds/makedeb.pub' | gpg --dearmor | sudo tee /usr/share/keyrings/makedeb-archive-keyring.gpg 1> /dev/null echo 'deb [signed-by=/usr/share/keyrings/makedeb-archive-keyring.gpg arch=all] https://proget.makedeb.org/ makedeb main' | sudo tee /etc/apt/sources.list.d/makedeb.list curl -fsSL 'https://proget.makedeb.org/debian-feeds/prebuilt-mpr.pub' | gpg --dearmor | sudo tee /usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg 1> /dev/null echo "deb [arch=all,$(dpkg --print-architecture) signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr $(lsb_release -cs)" | sudo tee /etc/apt/sources.list.d/prebuilt-mpr.list - sudo -E apt update - sudo -E apt upgrade --yes - sudo -E apt-get install --yes --no-install-recommends --ignore-missing mist + sudo -E apt update -qq + sudo -E apt upgrade --yes -qq + sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq mist {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing lsb-release gpg + apt-get install --yes --no-install-recommends --ignore-missing -qq lsb-release gpg curl -fsSL 'https://proget.makedeb.org/debian-feeds/makedeb.pub' | gpg --dearmor | tee /usr/share/keyrings/makedeb-archive-keyring.gpg 1> /dev/null echo 'deb [signed-by=/usr/share/keyrings/makedeb-archive-keyring.gpg arch=all] https://proget.makedeb.org/ makedeb main' | tee /etc/apt/sources.list.d/makedeb.list curl -fsSL 'https://proget.makedeb.org/debian-feeds/prebuilt-mpr.pub' | gpg --dearmor | tee /usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg 1> /dev/null echo "deb [arch=all,$(dpkg --print-architecture) signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr $(lsb_release -cs)" | tee /etc/apt/sources.list.d/prebuilt-mpr.list - apt update - apt upgrade --yes - apt-get install --yes --no-install-recommends --ignore-missing mist + apt update -qq + apt upgrade --yes -qq + apt-get install --yes --no-install-recommends --ignore-missing -qq mist {{- end}} mist update @@ -107,13 +107,13 @@ packages=( inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing $package + apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- end }} done - log ">>>>> Finish Debian/Ubuntu Linux packages installation <<<<<" + log "Finish Debian/Ubuntu Linux packages installation" {{- end }} diff --git a/home/.chezmoiscripts/run_onchange_after_20-config-zim.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_20-config-zim.sh.tmpl index 51c1eab..9dbd7ea 100644 --- a/home/.chezmoiscripts/run_onchange_after_20-config-zim.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_20-config-zim.sh.tmpl @@ -23,19 +23,19 @@ packages=( ### Install Zsh ### -log ">>>>> Begin Zsh installation <<<<<" +log "Begin Zsh installation" {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} ## Update system inf "updating system..." - yay -Syu --noconfirm + yay -Syu --noconfirm --quiet ## install packages for package in ${packages[@]}; do if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then inf "installing ${package}..." - yay -S --noconfirm $package + yay -S --noconfirm --quiet $package fi done @@ -45,11 +45,11 @@ log ">>>>> Begin Zsh installation <<<<<" ## Update system inf "updating system..." {{- if ne .chezmoi.username "root" }} - sudo -E apt update - sudo -E apt upgrade --yes + sudo -E apt update -qq + sudo -E apt upgrade --yes -qq {{- else }} - apt update - apt upgrade --yes + apt update -qq + apt upgrade --yes -qq {{- end}} packages=(${packages[@]//starship/}) @@ -59,9 +59,9 @@ log ">>>>> Begin Zsh installation <<<<<" inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing $package + apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- end }} done @@ -70,13 +70,13 @@ log ">>>>> Begin Zsh installation <<<<<" {{- end }} -log ">>>>> Finish Zsh installation <<<<<" +log "Finish Zsh installation" ### Config Zsh ### -log ">>>>> Installing Zim Framework <<<<<" +log "Installing Zim Framework" $(which zsh) -c "source ${ZIMDIR}/zimfw.zsh init -q" -log ">>>>> Finish zsh installation <<<<<" +log "Finish zsh installation" diff --git a/home/.chezmoiscripts/run_onchange_after_80-install-lvim.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_80-install-lvim.sh.tmpl index 24e7620..062dcda 100644 --- a/home/.chezmoiscripts/run_onchange_after_80-install-lvim.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_80-install-lvim.sh.tmpl @@ -24,19 +24,19 @@ packages=( -log ">>>>> Begin LVim installation <<<<<" +log "Begin LVim installation" {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} ## Update system inf "updating system..." - yay -Syu --noconfirm + yay -Syu --noconfirm --quiet ## Install packages for package in ${packages[@]}; do if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then inf "installing ${package}..." - yay -S --noconfirm $package + yay -S --noconfirm --quiet $package fi done @@ -47,11 +47,11 @@ log ">>>>> Begin LVim installation <<<<<" ## Update system inf "updating system..." {{- if ne .chezmoi.username "root" }} - sudo -E apt update - sudo -E apt upgrade --yes + sudo -E apt update -qq + sudo -E apt upgrade --yes -qq {{- else }} - apt update - apt upgrade --yes + apt update -qq + apt upgrade --yes -qq {{- end}} ## Install packages @@ -63,9 +63,9 @@ log ">>>>> Begin LVim installation <<<<<" inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing $package + apt-get install --yes --no-install-recommends --ignore-missing -qq $package {{- end }} done @@ -77,6 +77,6 @@ log ">>>>> Begin LVim installation <<<<<" inf "installing lvim..." LV_BRANCH='release-1.3/neovim-0.9' bash <(curl -s 'https://raw.githubusercontent.com/LunarVim/LunarVim/release-1.3/neovim-0.9/utils/installer/install.sh') -log ">>>>> Finish LVim installation <<<<<" +log "Finish LVim installation"