separate mirrorlist - improvements

This commit is contained in:
Daniel Langbein 2021-04-22 16:02:02 +02:00
parent 2e8d6d4deb
commit 31acd332a3
4 changed files with 18 additions and 11 deletions

View File

@ -2,22 +2,22 @@
_pkgname=pacman-mirrorlist _pkgname=pacman-mirrorlist
_reponame=arch-pkg _reponame=arch-pkg
pkgname="de-p1st-$_pkgname" pkgname="de-p1st-$_pkgname"
pkgver=0.0.1 pkgver=0.0.2
pkgrel=1 pkgrel=1
pkgdesc="selected Arch Linux mirrors" pkgdesc="selected Arch Linux mirrors"
arch=('any') arch=('any')
url="https://git.privacy1st.de/langfingaz/${_reponame}" url="https://git.privacy1st.de/langfingaz/${_reponame}"
license=('MIT') license=('MIT')
groups=() groups=()
depends=('pacman') depends=('pacman' 'holo')
makedepends=('git') makedepends=('git')
optdepends=() optdepends=()
provides=('pacman-mirrorlist') provides=()
conflicts=('pacman-mirrorlist') conflicts=()
replaces=() replaces=()
backup=() backup=()
options=() options=()
install= install="${pkgname}.install"
changelog= changelog=
source=("git+${url}.git") source=("git+${url}.git")
noextract=() noextract=()
@ -26,5 +26,7 @@ sha256sums=('SKIP')
package() { package() {
cd "${_reponame}/pkg/${pkgname}" cd "${_reponame}/pkg/${pkgname}"
install -Dm0644 mirrorlist "$pkgdir"/etc/pacman.d/mirrorlist install -Dm0644 de-p1st-mirrorlist "$pkgdir"/etc/pacman.d/de-p1st-mirrorlist
install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.conf.holoscript
} }

View File

@ -0,0 +1,7 @@
#!/bin/sh
# stdin: default config
# stdout: modified config
# replace all occurrences of "mirrorlist" with "de-p1st-mirrorlist"
sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|'
sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'

View File

@ -2,7 +2,7 @@
_pkgname=pacman _pkgname=pacman
_reponame=arch-pkg _reponame=arch-pkg
pkgname="de-p1st-$_pkgname" pkgname="de-p1st-$_pkgname"
pkgver=0.0.6 pkgver=0.0.7
pkgrel=1 pkgrel=1
pkgdesc="pacman with configuration" pkgdesc="pacman with configuration"
arch=('any') arch=('any')
@ -11,7 +11,7 @@ license=('MIT')
groups=() groups=()
depends=('pacman' 'holo') depends=('pacman' 'holo')
makedepends=('git') makedepends=('git')
optdepends=() optdepends=('de-p1st-pacman-mirrorlist')
provides=() provides=()
conflicts=() conflicts=()
replaces=() replaces=()
@ -28,7 +28,5 @@ package() {
install -Dm0644 pacman.d/de-p1st "$pkgdir"/etc/pacman.d/de-p1st install -Dm0644 pacman.d/de-p1st "$pkgdir"/etc/pacman.d/de-p1st
#install -Dm0644 pacman.d/mirrorlist "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.conf.holoscript
install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
} }