From e54a7c62a48de97bc3a1a87438b5169af93b8881 Mon Sep 17 00:00:00 2001
From: Nikolaos Kakouros <nkak@kth.se>
Date: Wed, 6 Oct 2021 19:24:32 +0000
Subject: [PATCH] fixes
---
commands/core.d/bootstrap | 1 -
commands/core.d/bootstrap.d/arch.sh | 11 ++++++++++-
lib/system | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/commands/core.d/bootstrap b/commands/core.d/bootstrap
index 676e109..87596a0 100755
--- a/commands/core.d/bootstrap
+++ b/commands/core.d/bootstrap
@@ -208,7 +208,6 @@ function core_bootstrap() {
core_parse_project_config
core_bootstrap_git_collab
# core_bootstrap_git_hooks
- core_bootstrap_git_branches
core_bootstrap_install_dependencies
core_bootstrap_install_command
core_bootstrap_git_lay
diff --git a/commands/core.d/bootstrap.d/arch.sh b/commands/core.d/bootstrap.d/arch.sh
index d2ba4f3..50fd028 100644
--- a/commands/core.d/bootstrap.d/arch.sh
+++ b/commands/core.d/bootstrap.d/arch.sh
@@ -1,6 +1,15 @@
#!/usr/bin/env bash
-distro_pacman="${distro_pacman:-sudo pacman -S --noconfirm}"
+if which yaourt &>/dev/null; then
+ distro_pacman="${distro_pacman:-yaourt -S --noconfirm}"
+ distro_update_cmd="${distro_update_cmd:-yaourt -Syyuu --aur --noconfirm --devel}"
+elif which paru &>/dev/null; then
+ distro_pacman="${distro_pacman:-paru -S --noconfirm}"
+ distro_update_cmd="${distro_pacman:-paru -Syyuu --noconfirm}"
+else
+ distro_pacman="${distro_pacman:-sudo pacman -S --noconfirm}"
+ distro_update_cmd="${distro_update_cmd:-sudo pacman -Syyuu --noconfirm}"
+fi
distro_packages+=(
"python"
diff --git a/lib/system b/lib/system
index 0659078..e32baa2 100755
--- a/lib/system
+++ b/lib/system
@@ -154,7 +154,7 @@ function get_completions() {
}
}' <<<"$help"
)"
- c=("${c[@]%[[:space:]]}")
+ c=(" ${c[@]%[[:space:]]} ")
if [[ "${#rest[@]}" -gt 0 ]]; then
unset "rest[-1]"
--
GitLab