diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 1259683..b34452e 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: Olivier Medoc pkgname=qubes-vm-core pkgver=`cat version` -pkgrel=4 +pkgrel=6 epoch= pkgdesc="The Qubes core files for installation inside a Qubes VM." arch=("x86_64") diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 810af8a..4f17442 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -198,13 +198,18 @@ systemctl daemon-reload } -config_addlinetofile() { +config_prependtomark() { +FILE=$1 +APPENDBEFORELINE=$2 +APPENDLINE=$3 +grep -q "$APPENDLINE" "$FILE" || sed "/$APPENDBEFORELINE/i$APPENDLINE" -i "$FILE" +} +config_appendtomark() { FILE=$1 APPENDAFTERLINE=$2 APPENDLINE=$3 grep -q "$APPENDLINE" "$FILE" || sed "/$APPENDAFTERLINE/a$APPENDLINE" -i "$FILE" - } update_finalize() { @@ -224,10 +229,11 @@ update_finalize() { # Archlinux specific: Prepare pacman.conf to add qubes specific config QUBES_MARKER="### QUBES CONFIG MARKER ###" - config_addlinetofile "/etc/pacman.conf" "NoUpgrade" "$QUBES_MARKER" + config_prependtomark "/etc/pacman.conf" "# REPOSITORIES" "$QUBES_MARKER" # Add Qubes setup script markers at the right place (this won't work at the end of pacman.conf)" - config_addlinetofile "/etc/pacman.conf "$QUBES_MARKER" "### QUBES BEGIN ###" + config_appendtomark "/etc/pacman.conf" "$QUBES_MARKER" "### QUBES END ###" + config_appendtomark "/etc/pacman.conf" "$QUBES_MARKER" "### QUBES BEGIN ###" systemctl daemon-reload }