summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2022-08-13 15:30:38 -0500
committerzachir <zachir@librem.one>2022-08-13 15:30:38 -0500
commit599cad753a7ed669e08e56df778757e649db87ec (patch)
treeef6a237a85aa94f71dc6757de4eab489ba235fcf
parentd65fcf7ec796763a907ed8620d0a700a410022bb (diff)
fix zirless repo issues
-rw-r--r--zirless.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/zirless.sh b/zirless.sh
index 45fa970..9d50029 100644
--- a/zirless.sh
+++ b/zirless.sh
@@ -111,11 +111,12 @@ permit :wheel nopass cmd loadkeys #ZIRLESS" >> /etc/doas.conf
fi ;}
artixaddlib32repo() { # Enables the lib32 Artix repo
- grep -q '^#[lib32]\n#Include = /etc/pacman.d/mirrorlist' /etc/pacman.conf &&
- sed -E "s/^#(\[lib32\]])/\\1;/#Include/d;#[.*-gremlins]/d;/\[lib32\]/a Include = /etc/pacman.d/mirrorlist" /etc/pacman.conf ||
- printf "[lib32]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf ;}
+ dialog --infobox "Adding lib32 repo to Artix..." 4 50
+ sed -E "s/^#(\[lib32\]])/\\1;/#Include/d;#[.*-gremlins]/d;/\[lib32\]/a Include = /etc/pacman.d/mirrorlist" /etc/pacman.conf
+ pacman -Syy ;}
artixadduniverserepo() { # Enables the universe repo (necessary to add Arch repos)
+ dialog --infobox "Adding universe repo to Artix..." 4 50
echo "
Server = https://universe.artixlinux.org/$arch
Server = https://mirror1.artixlinux.org/universe/$arch
@@ -129,6 +130,7 @@ Include = /etc/pacman.d/mirrorlist-universe" >> /etc/pacman.conf
pacman -Syy ;}
artixaddarchrepos() { # Adds the Arch repos to Artix Linux (some ZIRLESS packages require it)
+ dialog --infobox "Adding arch repos to Artix..." 4 50
grep -q 'Artix' /etc/lsb-release && \
pacman -S --noconfirm artix-archlinux-support archlinux-mirrorlist archlinux-keyring >/dev/null 2>&1 || exit 3
grep -q '\[extra\]\|\[community\]' /etc/pacman.conf || echo "
@@ -141,8 +143,7 @@ Include = /etc/pacman.d/mirrorlist-arch
[multilib]
Include = /etc/pacman.d/mirrorlist-arch
" >> /etc/pacman.conf >/dev/null 2>&1
- pacman -Syy
- pacman-key --refresh-keys ;}
+ pacman -Syy ;}
manualinstall() { # Installs $1 manually if not installed. Used only for AUR helper here.
[ -f "/usr/bin/$1" ] || (