From d38ff5385017d5d7dcb7bc5cf75aa3d7cd5d580b Mon Sep 17 00:00:00 2001
From: Jeff LANCE <email@jefflance.me>
Date: Tue, 27 Feb 2024 10:39:00 +0100
Subject: [PATCH] Up.

---
 .../run_onchange_10-install-packages.sh.tmpl  |  9 ++-
 .../run_onchange_50-install-zsh.sh.tmpl       | 72 +++++++++----------
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl b/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
index 64d1a92..38ea113 100644
--- a/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
+++ b/home/.chezmoiscripts/run_onchange_10-install-packages.sh.tmpl
@@ -6,17 +6,18 @@ packages=(
   curl
   direnv
   ranger
+  starship
   tmux
   trash-cli
   unzip
   wget
   zip
   zoxide
+  zsh
 )
 
 {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
 
-  {{- /* we're on Arch based system */ -}}
   echo -e "\033[0;32m>>>>> Begin Arch/Manjaro Linux packages installation <<<<<\033[0m"
 
   ## Update system
@@ -57,7 +58,6 @@ packages=(
 
 {{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
 
-  {{- /* we're on Debian based system */ -}}
   echo -e "\033[0;32m>>>>> Begin Debian/Ubuntu Linux packages installation <<<<<\033[0m"
 
   ## Update system
@@ -70,6 +70,9 @@ packages=(
   {{- end}}
 
   ## Install packages
+  packages+=(makedeb)
+  packages=${packages[@]//starship}
+
   for package in ${packages[@]}; do
     echo "installing packages"
 
@@ -80,6 +83,8 @@ packages=(
     {{- end }}
   done
 
+  curl -sS https://starship.rs/install.sh | sh
+
   echo -e "\033[0;32m>>>>> Finish Debian/Ubuntu Linux packages installation <<<<<\033[0m"
 
 {{- end }}
diff --git a/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl
index c53d8bd..1cebd43 100644
--- a/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl
+++ b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl
@@ -2,52 +2,52 @@
 
 ZIMDIR=${HOME}/.zim
 
-{{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
+## {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}}
 
-  {{- /* we're on Arch based system */ -}}
-  echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
+##   {{- /* we're on Arch based system */ -}}
+##   echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
 
-  ## Update system
-  {{- if ne .chezmoi.username "root" }}
-    sudo pacman -Syu --noconfirm
-  {{- else }}
-    pacman -Syu --noconfirm
-  {{- end}}
+##   ## Update system
+##   {{- if ne .chezmoi.username "root" }}
+##     sudo pacman -Syu --noconfirm
+##   {{- else }}
+##     pacman -Syu --noconfirm
+##   {{- end}}
 
-  ## Install packages
-  if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then
-    {{- if ne .chezmoi.username "root" }}
-      sudo yay -S --noconfirm zsh starship
-    {{- else }}
-      yay -S --noconfirm zsh starship
-    {{- end }}
-  fi
+##   ## Install packages
+##   if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then
+##     {{- if ne .chezmoi.username "root" }}
+##       sudo yay -S --noconfirm zsh starship
+##     {{- else }}
+##       yay -S --noconfirm zsh starship
+##     {{- end }}
+##   fi
 
 
-{{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
+## {{ else if (eq .chezmoi.osRelease.id "debian" "ubuntu") -}}
 
-  {{- /* we're on Debian based system */ -}}
-  echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
+##   {{- /* we're on Debian based system */ -}}
+##   echo -e "\033[0;32m>>>>> Begin zsh installation <<<<<\033[0m"
 
-  ## Update system
-  {{- if ne .chezmoi.username "root" }}
-    DEBIAN_FRONTEND=noninteractive sudo -E apt update
-    DEBIAN_FRONTEND=noninteractive sudo -E apt upgrade --yes
-  {{- else }}
-    DEBIAN_FRONTEND=noninteractive apt update
-    DEBIAN_FRONTEND=noninteractive apt upgrade --yes
-  {{- end}}
+##   ## Update system
+##   {{- if ne .chezmoi.username "root" }}
+##     DEBIAN_FRONTEND=noninteractive sudo -E apt update
+##     DEBIAN_FRONTEND=noninteractive sudo -E apt upgrade --yes
+##   {{- else }}
+##     DEBIAN_FRONTEND=noninteractive apt update
+##     DEBIAN_FRONTEND=noninteractive apt upgrade --yes
+##   {{- end}}
 
-  ## Install packages
-  {{- if ne .chezmoi.username "root" }}
-    DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh
-  {{- else }}
-    DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing zsh
-  {{- end }}
+##   ## Install packages
+##   {{- if ne .chezmoi.username "root" }}
+##     DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh
+##   {{- else }}
+##     DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing zsh
+##   {{- end }}
 
-  curl -sS https://starship.rs/install.sh | sh
+##   curl -sS https://starship.rs/install.sh | sh
 
-{{- end }}
+## {{- end }}
 
 
 echo -e "\033[0;32m>>>>> Installing Zim Framework <<<<<\033[0m"