From 2f6be902422a89752a7f69b026e878f4b6df2900 Mon Sep 17 00:00:00 2001
From: Yuan Chiu <chyuaner@gmail.com>
Date: Fri, 2 May 2025 14:24:38 +0800
Subject: [PATCH] fix manjaro install script

---
 .chezmoidata/packages.toml                    |  3 +++
 ...ange_before_linux-install-packages.sh.tmpl | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.chezmoidata/packages.toml b/.chezmoidata/packages.toml
index b401ffc..9ef595a 100644
--- a/.chezmoidata/packages.toml
+++ b/.chezmoidata/packages.toml
@@ -36,11 +36,13 @@ pacman_force = [
 
 pacman = [
   'chezmoi',
+  'sudo',
   'git',
   'base-devel',
   'fakeroot',
   'gcc',
   'cmake',
+  'zsh',
   'lsix',
   'ueberzugpp',
   'eza',
@@ -73,6 +75,7 @@ pacman = [
   'fakeroot',
   'gcc',
   'cmake',
+  'zsh',
   'lsix',
   'ueberzugpp',
   'eza',
diff --git a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
index 8c9cf8e..620506d 100644
--- a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
+++ b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
@@ -5,10 +5,19 @@
 {{ if eq .chezmoi.osRelease.id "manjaro" -}}
 
 {{/* ---- 整理待安裝清單 -------------------------------------------------- */ -}}
+
+{{- $pacman_force := .packages.linux.arch.pacman_force -}}
+{{- $pacmanInstall := .packages.linux.arch.pacman -}}
+{{- $aurInstall := .packages.linux.arch.aur -}}
+{{- if not .noGUI -}}
+{{- $pacmanInstall := concat .packages.linux.arch.pacman .packages.linux.arch.pacman_gui -}}
+{{- $aurInstall := concat .packages.linux.arch.aur .packages.linux.arch.aur_gui -}}
+{{- end -}}
+
+{{ if eq .chezmoi.osRelease.id "manjaro" -}}
 {{- $pacman_force := .packages.linux.manjaro.pacman_force -}}
 {{- $pacmanInstall := .packages.linux.manjaro.pacman -}}
 {{- $aurInstall := .packages.linux.manjaro.aur -}}
-
 {{- if not .noGUI -}}
 {{- $pacmanInstall := concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}}
 {{- $aurInstall := concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}}
@@ -62,6 +71,8 @@ for package in "${pacmanForce_packages[@]}"; do
   to_install_pacmanForce+=("$package")
 done
 
+sudo pacman -Sy
+
 # 等待鎖定檔案被移除
 wait_for_pacman_unlock
 
@@ -88,10 +99,16 @@ fi
 # 等待鎖定檔案被移除
 wait_for_pacman_unlock
 
+{{ if eq .chezmoi.osRelease.id "manjaro" -}}
 if ! is_installed "yay"; then
   echo "  - Installing yay"
   sudo pacman -S --needed --noconfirm yay
 fi
+{{ else -}}
+if ! command -v yay &> /dev/null; then
+    git clone https://aur.archlinux.org/yay-bin.git && cd yay-bin && makepkg -si
+fi
+{{ end -}}
 
 to_install_aur=()
 for package in "${aur_packages[@]}"; do