cleanup; update build-pkg.sh

build-pkg.sh

@@ -31,7 +31,7 @@ function build-pkg() {
   # Check if PKGBUILD exists, otherwise skip
   [ -f "pkg/${PKG}/PKGBUILD" ] || {
     echo "Directory pkg/${PKG} does not contain a PKGBUILD file - skipping it!";
-    FAILED_PKGS+=("${PKG}");
+    SKIPPED_PKGS+=("${PKG}");
     return 0;
   }
 
@@ -41,48 +41,64 @@ function build-pkg() {
 #   build-with-makepkg || {
   build-with-aurutils || {
     echo "Failed to build package ${PKG}!";
-    FAILED_PKGS+=("${PKG}");
+    return 1
   }
 
   cd ../..        || return $?
 }
 
-
+function push-pkg() {
-function build-all() {
+  arch-repo-push-new || return $?  # Push remote repository
-  for PKG in pkg/*; do
+  echo "Running 'pacman -Sy' to update de-p1st mirror database ..."
-    build-pkg "$(basename "${PKG}")" || return $?
+  sudo pacman -Sy || return $?
-  done
 }
 
 function main() {
   # Usage:
-  #   Either zero arguments to build all packages
+  #   Without arguments: Build all packages and watch out for dependencies between them:
-  #   or the names of the packages to build as arguments
+  #     First build packages on wich others depend
+  #     Then add them to de-p1st mirror
+  #     And repeat these steps until all packages are built
+  #   First argument "all": Build all packages, ordered by name
+  #   Multiple arguments: Build the the specified packages in their given order
 
-  FAILED_PKGS=()
+  SKIPPED_PKGS=()
-
-
-  if [ "$#" -gt "0" ]; then
-    # At least one argument is given
 
+  if [ "$1" = "all" ]; then
+    for PKG in pkg/*; do
+      build-pkg "$(basename "${PKG}")" || return $?
+    done
+  elif [ "$#" -gt "0" ]; then
+    # List of packages is given as arguments
     for PKG in "$@"; do
       build-pkg "$PKG" || return $?
     done
-
   else
     # No arguments given
-    build-all || return $?
+    # -> build in specified order EXCEPT de-p1st-locale
+
+    build-pkg xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-de-x11 de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $?
+    push-pkg || return $?
+
+    build-pkg de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $?
+    push-pkg || return $?
+
+    build-pkg de-p1st-base || return $?
+    push-pkg || return $?
+
+    build-pkg de-p1st-xfce4 || return $?
+    push-pkg || return $?
+
+    build-pkg de-p1st-xfce4-hidpi || return $?
+    push-pkg || return $?
   fi
 
-  # Push remote repository
+  push-pkg || return $?
-  echo ""
-  arch-repo-push-new || exit
 
   if [ "${#FAILED_PKGS[@]}" -gt "0" ]; then
     echo ""
-    echo "Warning: Not all packages were build successfully: ${FAILED_PKGS[*]}"
+    echo "Warning: Some packages were skipped: ${SKIPPED_PKGS[*]}"
     return 1
-
   fi
 }
 

pkg/de-p1st-dns/PKGBUILD

@@ -2,32 +2,23 @@
 _pkgname=dns
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.3
+pkgver=0.0.4
 pkgrel=1
 pkgdesc="DNS configuration: Use DNS over TLS"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 
 # systemd-resolvd
 depends=('systemd')
 # (optional) replacement for resolvconf
 depends+=('systemd-resolvconf')
 # this has only been tested with NetworkManager, so we depend on it
-depends+=('networkmanager')
+depends+=('de-p1st-networkmanager')
 
 makedepends=('git')
-optdepends=()
-provides=()
 conflicts=() # 'openresolv' conflicts with 'systemd-resolvd'
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-gnupg/PKGBUILD

@@ -3,22 +3,13 @@ _pkgname=gnupg
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="gnupg with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('gnupg')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git" 'git+https://github.com/ioerror/duraconf.git')
 noextract=()
 sha256sums=('SKIP' 'SKIP')

pkg/de-p1st-grub/PKGBUILD

@@ -3,24 +3,16 @@ _pkgname=grub
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="grub with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('grub' 'holo')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
 changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-installer/PKGBUILD

@@ -3,24 +3,14 @@ _pkgname=installer
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Bash script to install Arch Linux"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('dialog')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-kernel-default/PKGBUILD

@@ -3,11 +3,10 @@ _pkgname=kernel-default
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The Linux kernel, modules and headers"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('linux' 'linux-headers')
-optdepends=()
 provides=('de-p1st-kernel') # implicitly provides $pkgname

pkg/de-p1st-kernel-lts/PKGBUILD

@@ -3,11 +3,10 @@ _pkgname=kernel-lts
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The LTS Linux kernel, modules and headers"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('linux-lts' 'linux-lts-headers')
-optdepends=()
 provides=('de-p1st-kernel') # implicitly provides $pkgname

pkg/de-p1st-keyboard-de/PKGBUILD

@@ -3,12 +3,11 @@ _pkgname=keyboard-de
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="vconsole (virtual console) keyboard configuration: de-latin1-nodeadkeys"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=()
 makedepends=('git')
 
@@ -16,7 +15,6 @@ provides=('de-p1st-keyboard')
 conflicts=('de-p1st-keyboard')
 
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-keyboard-x11-de/PKGBUILD

@@ -3,12 +3,11 @@ _pkgname=keyboard-x11-de
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="xorg (X11) keyboard configuration: de nodeadkeys"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=()
 makedepends=('git')
 
@@ -16,7 +15,6 @@ provides=('de-p1st-keyboard-x11')
 conflicts=('de-p1st-keyboard-x11')
 
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-locale/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=locale
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="locale and timezone"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('holo')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-makepkg/PKGBUILD

@@ -3,24 +3,16 @@ _pkgname=makepkg
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Personalized makepkg.conf"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('pacman' 'holo')  # /etc/makepkg.conf belongs to pacman
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
 changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-mkinitcpio/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=mkinitcpio
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="mkinitcpio configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('mkinitcpio' 'holo' 'base')  # without base "holo apply" may fail on initial system installation
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-nano/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=nano
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="nano with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('nano' 'holo')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-networkmanager/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=networkmanager
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="NetworkManager with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('networkmanager' 'systemd')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-pacman-mirrorlist/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=pacman-mirrorlist
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('pacman' 'holo' 'base')  # without base "holo apply" may fail on initial system installation
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-pacman/PKGBUILD

@@ -3,24 +3,16 @@ _pkgname=pacman
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="pacman with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('pacman' 'holo')
 makedepends=('git')
 optdepends=('de-p1st-pacman-mirrorlist')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-repo/PKGBUILD

@@ -3,24 +3,14 @@ _pkgname=repo
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('openssh' 'aurutils') # arch-repo-vercmp uses "aur vercmp" which is part of "aurutils"
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-screen/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=screen
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="screen with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('screen' 'holo')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-smartcard/PKGBUILD

@@ -3,7 +3,7 @@ _pkgname=smartcard
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Configuration to use smartcards"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
@@ -11,16 +11,8 @@ license=('MIT')
 groups=()
 depends=('ccid' 'opensc' 'systemd' 'holo' 'de-p1st-gnupg')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-sudo/PKGBUILD

@@ -3,24 +3,14 @@ _pkgname=sudo
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="sudo with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('sudo')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-systemd/PKGBUILD

@@ -3,24 +3,15 @@ _pkgname=systemd
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="systemd with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('systemd')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install='.install'
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-theme/PKGBUILD

@@ -3,24 +3,14 @@ _pkgname=theme
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Uniform look for QT and GTK applications"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-groups=()
 depends=('adwaita-qt' 'adwaita-qt4')
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
 source=("git+${url}.git")
-noextract=()
 sha256sums=('SKIP')
 
 package() {

pkg/de-p1st-ucode-amd/PKGBUILD

@@ -3,11 +3,10 @@ _pkgname=ucode-amd
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD Microcode"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('amd-ucode')
-optdepends=()
 provides=('de-p1st-ucode') # implicitly provides $pkgname

pkg/de-p1st-ucode-intel/PKGBUILD

@@ -3,11 +3,10 @@ _pkgname=ucode-intel
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel Microcode"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('intel-ucode')
-optdepends=()
 provides=('de-p1st-ucode') # implicitly provides $pkgname

pkg/de-p1st-ucode-placeholder/PKGBUILD

@@ -3,11 +3,10 @@ _pkgname=ucode-placeholder
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ucode placeholder, e.g. for VM installation"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
-optdepends=()
 provides=('de-p1st-ucode') # implicitly provides $pkgname