From d7f8752bd71941ab8606960b6c1878c435659bc6 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Mon, 3 May 2021 18:14:37 +0200
Subject: [PATCH] fix?

---
 pkg/de-p1st-locale/.install            | 15 ++++++++++-----
 pkg/de-p1st-locale/PKGBUILD            | 11 ++++++++---
 pkg/de-p1st-mkinitcpio/PKGBUILD        |  4 ++--
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD |  4 ++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkg/de-p1st-locale/.install b/pkg/de-p1st-locale/.install
index bff9531..ef36ac6 100644
--- a/pkg/de-p1st-locale/.install
+++ b/pkg/de-p1st-locale/.install
@@ -1,19 +1,24 @@
+pre_install() {
+  mv /etc/locale.conf /etc/locale.conf.bkp
+}
+
 post_install() {
-  holo apply --force file:/etc/locale.conf
+  # holo apply --force file:/etc/locale.conf
   holo apply --force file:/etc/locale.gen
-  holo apply --force file:/etc/localtime
+  # holo apply --force file:/etc/localtime
 
   locale-gen
 }
 
 post_upgrade() {
-  holo apply --force file:/etc/locale.conf
+  # holo apply --force file:/etc/locale.conf
   holo apply --force file:/etc/locale.gen
-  holo apply --force file:/etc/localtime
+  # holo apply --force file:/etc/localtime
 
   locale-gen
 }
 
 post_remove() {
   holo apply
-}
\ No newline at end of file
+  mv /etc/locale.conf.bkp /etc/locale.conf
+}
diff --git a/pkg/de-p1st-locale/PKGBUILD b/pkg/de-p1st-locale/PKGBUILD
index b4aca0b..9a70a85 100644
--- a/pkg/de-p1st-locale/PKGBUILD
+++ b/pkg/de-p1st-locale/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=locale
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.5
+pkgver=0.0.6
 pkgrel=1
 pkgdesc="locale and timezone"
 arch=('any')
@@ -29,8 +29,13 @@ package() {
   # Note: The following three files are overwritten with "holo apply --force ..."
   # See ".install" script
 
-  install -Dm0644 locale.conf              "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.conf
+  # (!)
+  # install -Dm0644 locale.conf              "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.conf
+  install -Dm0644 locale.conf              "$pkgdir"/etc/locale.conf
+
   install -Dm0644 locale.gen               "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.gen
 
-  ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/localtime
+  # (!)
+  # ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/localtime
+  ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/etc/localtime
 }
diff --git a/pkg/de-p1st-mkinitcpio/PKGBUILD b/pkg/de-p1st-mkinitcpio/PKGBUILD
index dff45f6..4d543dc 100644
--- a/pkg/de-p1st-mkinitcpio/PKGBUILD
+++ b/pkg/de-p1st-mkinitcpio/PKGBUILD
@@ -2,14 +2,14 @@
 _pkgname=mkinitcpio
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="mkinitcpio configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 groups=()
-depends=('mkinitcpio' 'holo')
+depends=('mkinitcpio' 'holo' 'base')  # without base "holo apply" may fail on initial system installation
 makedepends=('git')
 optdepends=()
 provides=()
diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 0cd2f11..cf3d700 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -2,14 +2,14 @@
 _pkgname=pacman-mirrorlist
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.5
+pkgver=0.0.6
 pkgrel=2
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 groups=()
-depends=('pacman' 'holo')
+depends=('pacman' 'holo' 'base')  # without base "holo apply" may fail on initial system installation
 makedepends=('git')
 optdepends=()
 provides=()