yuan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix manjaro install script

Browse Source
This commit is contained in:
Yuan Chiu 2025-05-02 14:24:38 +08:00
parent 00deaaa6b5
commit 2f6be90242
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.chezmoidata/packages.toml
View File

@ -36,11 +36,13 @@ pacman_force = [
pacman = [ pacman = [
'chezmoi', 'chezmoi',
'sudo',
'git', 'git',
'base-devel', 'base-devel',
'fakeroot', 'fakeroot',
'gcc', 'gcc',
'cmake', 'cmake',
'zsh',
'lsix', 'lsix',
'ueberzugpp', 'ueberzugpp',
'eza', 'eza',
@ -73,6 +75,7 @@ pacman = [
'fakeroot', 'fakeroot',
'gcc', 'gcc',
'cmake', 'cmake',
'zsh',
'lsix', 'lsix',
'ueberzugpp', 'ueberzugpp',
'eza', 'eza',

19
.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
View File

@ -5,10 +5,19 @@
{{ if eq .chezmoi.osRelease.id "manjaro" -}} {{ 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 -}} {{- $pacman_force := .packages.linux.manjaro.pacman_force -}}
{{- $pacmanInstall := .packages.linux.manjaro.pacman -}} {{- $pacmanInstall := .packages.linux.manjaro.pacman -}}
{{- $aurInstall := .packages.linux.manjaro.aur -}} {{- $aurInstall := .packages.linux.manjaro.aur -}}
{{- if not .noGUI -}} {{- if not .noGUI -}}
{{- $pacmanInstall := concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}} {{- $pacmanInstall := concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}}
{{- $aurInstall := concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_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") to_install_pacmanForce+=("$package")
done done
sudo pacman -Sy
# 等待鎖定檔案被移除 # 等待鎖定檔案被移除
wait_for_pacman_unlock wait_for_pacman_unlock
@ -88,10 +99,16 @@ fi
# 等待鎖定檔案被移除 # 等待鎖定檔案被移除
wait_for_pacman_unlock wait_for_pacman_unlock
{{ if eq .chezmoi.osRelease.id "manjaro" -}}
if ! is_installed "yay"; then if ! is_installed "yay"; then
echo " - Installing yay" echo " - Installing yay"
sudo pacman -S --needed --noconfirm yay sudo pacman -S --needed --noconfirm yay
fi 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=() to_install_aur=()
for package in "${aur_packages[@]}"; do for package in "${aur_packages[@]}"; do