From c7cb22732c0d885236273bc7d8efa1c87c99236d Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Mon, 3 May 2021 16:41:33 +0200
Subject: [PATCH] installer script: package (14)

---
 pkg/de-p1st-installer/{PKGBUILD_TODO.txt => PKGBUILD} | 8 +++++++-
 pkg/de-p1st-installer/de-p1st-installer.sh            | 8 ++++----
 pkg/de-p1st-repo/PKGBUILD                             | 5 ++---
 3 files changed, 13 insertions(+), 8 deletions(-)
 rename pkg/de-p1st-installer/{PKGBUILD_TODO.txt => PKGBUILD} (55%)

diff --git a/pkg/de-p1st-installer/PKGBUILD_TODO.txt b/pkg/de-p1st-installer/PKGBUILD
similarity index 55%
rename from pkg/de-p1st-installer/PKGBUILD_TODO.txt
rename to pkg/de-p1st-installer/PKGBUILD
index 24ab62b..d4fc827 100644
--- a/pkg/de-p1st-installer/PKGBUILD_TODO.txt
+++ b/pkg/de-p1st-installer/PKGBUILD
@@ -26,5 +26,11 @@ sha256sums=('SKIP')
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0555 de-p1st-installer.sh "$pkgdir"/usr/bin/de-p1st-installer
+  install -Dm0544 de-p1st-installer.sh "$pkgdir"/usr/bin/"${pkgname}"
+  
+  install -Dm0644 lib/block-device.sh  "$pkgdir"/usr/lib/"${pkgname}"/block-device.sh
+  install -Dm0644 lib/user-input.sh    "$pkgdir"/usr/lib/"${pkgname}"/user-input.sh
+  install -Dm0644 lib/util.sh          "$pkgdir"/usr/lib/"${pkgname}"/util.sh
+
+  install -Dm0644 -o0 installer.cfg    "$pkgdir"/etc/"${pkgname}"/installer.cfg
 }
diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh
index 5e97a70..d6a7fa5 100755
--- a/pkg/de-p1st-installer/de-p1st-installer.sh
+++ b/pkg/de-p1st-installer/de-p1st-installer.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # load config
-source installer.cfg       || { exit 1; }
+source /etc/de-p1st-installer/installer.cfg       || { exit 1; }
 
 # load functions
-source lib/util.sh         || { exit 1; }
-source lib/user-input.sh   || { exit 1; }
-source lib/block-device.sh || { exit 1; }
+source /usr/lib/de-p1st-installer/util.sh         || { exit 1; }
+source /usr/lib/de-p1st-installer/user-input.sh   || { exit 1; }
+source /usr/lib/de-p1st-installer/block-device.sh || { exit 1; }
 
 
 function check_network() {
diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index eb5026d..8439b2c 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=repo
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.6
+pkgver=0.1.7
 pkgrel=1
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
@@ -30,6 +30,5 @@ package() {
   install -Dm0555 arch-repo-receive-new.sh "$pkgdir"/usr/bin/arch-repo-receive-new
   install -Dm0555 arch-repo-vercmp.sh      "$pkgdir"/usr/bin/arch-repo-vercmp
 
-  install -Dm0644 arch-repo.cfg            "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
-  chown 0:0                                "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
+  install -Dm0644 -o0 arch-repo.cfg        "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
 }