From 6661045a19875bf8e56f07ce9bed51d3a21d92c3 Mon Sep 17 00:00:00 2001
From: Nikolaos Kakouros <nkak@kth.se>
Date: Mon, 20 Nov 2023 23:48:48 +0000
Subject: [PATCH] wip
---
commands/core.d/bootstrap.d/arch.sh | 6 +++---
lib/core | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/commands/core.d/bootstrap.d/arch.sh b/commands/core.d/bootstrap.d/arch.sh
index 54b9d0a..5861655 100644
--- a/commands/core.d/bootstrap.d/arch.sh
+++ b/commands/core.d/bootstrap.d/arch.sh
@@ -2,10 +2,10 @@
if which yaourt &>/dev/null; then
distro_pacman="${distro_pacman:-yaourt -S --noconfirm}"
- distro_update_cmd="${distro_update_cmd:-yaourt -Syyuu --aur --noconfirm --devel}"
+ distro_update_cmd="${distro_update_cmd:-yaourt -Syy --aur --noconfirm --devel}"
elif which paru &>/dev/null; then
distro_pacman="${distro_pacman:-paru -S --noconfirm}"
- distro_update_cmd="${distro_pacman:-paru -Syyuu --noconfirm}"
+ distro_update_cmd="${distro_pacman:-paru -Syy --noconfirm}"
else
distro_pacman="${distro_pacman:-sudo pacman -S --noconfirm}"
distro_update_cmd="${distro_update_cmd:-sudo pacman -Syyuu --noconfirm}"
@@ -30,4 +30,4 @@ $distro_pacman "${distro_packages[@]}"
info "installing Python 3 dependencies..."
-sudo pip3 install "${pip_packages[@]}"
+sudo pip3 install --break-system-packages "${pip_packages[@]}"
diff --git a/lib/core b/lib/core
index a9ee287..2a24049 100644
--- a/lib/core
+++ b/lib/core
@@ -70,7 +70,7 @@ function core_parse_project_config() {
local value
while read -s line; do
- if [[ "$line" =~ ^#|\s*\[ ]]; then
+ if [[ "$line" =~ ^(#|\s*\[|$) ]]; then
continue
fi
@@ -79,6 +79,6 @@ function core_parse_project_config() {
value="${line#*=}"
value="${value# }"
- eval "declare -gx CONF_${conf~~}='$value'"
+ eval 'declare -gx CONF_'${conf~~}'='"$value"
done <"$_HEADSTART_PROJECT_CONFIG"
}
--
GitLab