From d1167971300c41f473b894e81641aeb911a07b5e Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 13 Nov 2021 17:43:42 +0100 Subject: [PATCH] de-p1st-pacman: check for [de-p1st] repo --- pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript | 2 +- pkg/de-p1st-pacman/PKGBUILD | 2 +- pkg/de-p1st-pacman/pacman.conf.holoscript | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript b/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript index c026799..51ee6ef 100644 --- a/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript +++ b/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript @@ -3,7 +3,7 @@ # stdout: modified config set -e -# save stdin (content of /etc/mkinitcpio.conf) in variable +# save stdin in variable stdin="$(cat)" # assert MODULES is empty diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD index 800215d..af29648 100644 --- a/pkg/de-p1st-pacman/PKGBUILD +++ b/pkg/de-p1st-pacman/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=pacman _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="pacman with configuration" arch=('any') diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript index fdeba55..8cb3c88 100644 --- a/pkg/de-p1st-pacman/pacman.conf.holoscript +++ b/pkg/de-p1st-pacman/pacman.conf.holoscript @@ -3,7 +3,7 @@ # stdout: modified config set -e -# save stdin (content of /etc/mkinitcpio.conf) in variable +# save stdin in variable stdin="$(cat)" # Enable parallel downloads @@ -15,6 +15,9 @@ echo "$stdin" | sed 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' # Enable multilib repository printf '\n[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' +# Assert de-p1st is not enabled +! echo "$stdin" | grep --quiet '^\[de-p1st\].*$' + # de-p1st mirror printf '\n' printf 'Include = /etc/pacman.d/de-p1st\n'