From ea29aef48c9ba3da39170ccbe7b4ff33c1496f01 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Mon, 12 Jul 2021 11:13:14 +0200 Subject: [PATCH] fix --- pkg/de-p1st-installer/PKGBUILD | 2 +- pkg/de-p1st-installer/de-p1st-installer.sh | 2 +- pkg/de-p1st-signal-desktop/.install | 4 ++-- pkg/de-p1st-signal-desktop/PKGBUILD | 2 +- pkg/de-p1st-xfce4/PKGBUILD | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD index 1ea70a4..ffae1be 100644 --- a/pkg/de-p1st-installer/PKGBUILD +++ b/pkg/de-p1st-installer/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=installer _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.1.20 +pkgver=0.1.21 pkgrel=1 pkgdesc="Bash script to install Arch Linux" arch=('any') diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh index 567b6bf..07f494b 100755 --- a/pkg/de-p1st-installer/de-p1st-installer.sh +++ b/pkg/de-p1st-installer/de-p1st-installer.sh @@ -445,7 +445,7 @@ sed "s|^GRUB_CMDLINE_LINUX=\"\"\$|GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by- sudo chmod 0544 "${holoScriptDir}"/grub.holoscript || return $? } # Then we apply the holoscript - sudo arch-chroot /mnt holo apply -f file:/etc/default/grub || return $? + sudo arch-chroot /mnt holo apply --force file:/etc/default/grub || return $? # And finally run grub-mkconfig sudo arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg || return $? } diff --git a/pkg/de-p1st-signal-desktop/.install b/pkg/de-p1st-signal-desktop/.install index b754ef5..295c234 100644 --- a/pkg/de-p1st-signal-desktop/.install +++ b/pkg/de-p1st-signal-desktop/.install @@ -1,12 +1,12 @@ ## arg 1: the new package version post_install() { - holo apply + holo apply --force file:/usr/share/applications/signal-desktop.desktop } ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { - holo apply + holo apply --force file:/usr/share/applications/signal-desktop.desktop } ## arg 1: the old package version diff --git a/pkg/de-p1st-signal-desktop/PKGBUILD b/pkg/de-p1st-signal-desktop/PKGBUILD index 98ce5c8..c182b4c 100644 --- a/pkg/de-p1st-signal-desktop/PKGBUILD +++ b/pkg/de-p1st-signal-desktop/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=signal-desktop _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.2 +pkgver=0.0.3 pkgrel=1 pkgdesc="Signal Desktop with modified .desktop entry to start minimized in system tray" arch=('any') diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index 7cfd000..ad0ff6c 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -2,13 +2,14 @@ _pkgname=xfce4 _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.28 +pkgver=0.0.29 pkgrel=1 pkgdesc="XFCE4 with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') makedepends=('git') +backup=('etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml') # de-p1st-xfce4-hidpi changes this file through holo install='.install' source=("git+${url}.git") sha256sums=('SKIP')