From 0178bb53d15b331ddb3908b15a62a64225012c30 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 14 Jul 2024 09:44:32 +0200 Subject: [PATCH] Streamline `pacman` installation --- scripts/Arch/OS/install.fish | 2 +- scripts/Arch/Software/pacman/main.fish | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 scripts/Arch/Software/pacman/main.fish diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish index 12d0c134..c2a7fc4a 100644 --- a/scripts/Arch/OS/install.fish +++ b/scripts/Arch/OS/install.fish @@ -4,7 +4,7 @@ begin function initialize -V dir source "$dir/../Software/base-devel/main.fish" - "$dir/../Config/pacman/install.sh" + source "$dir/../Software/pacman/main.fish" "$dir/../Software/yay/install.sh" end diff --git a/scripts/Arch/Software/pacman/main.fish b/scripts/Arch/Software/pacman/main.fish new file mode 100644 index 00000000..b34209b3 --- /dev/null +++ b/scripts/Arch/Software/pacman/main.fish @@ -0,0 +1,23 @@ +#!/bin/env fish +begin + set -l dir (status dirname) + source "$dir/../../Scripts/software.fish" + + function installSW + configureSW + end + + function configureSW + sed -i \ + -e "/^\[options\]$/,/^\[/{" \ + -e "s/^#\?\(Color\)$/\1/;" \ + -e "/^# Misc Options$/{" ( + # -e "a ILoveCandy" + ) \ + -e "};" \ + -e "/^#\?\[multilib\]$/,/^$/{ s/^#\?\(.*\)$/\1/; }" \ + /etc/pacman.conf + + pacinst -Sy + end +end