From 758a02d667b952fec55a679a35fc9545eb70b15d Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Thu, 27 May 2021 19:39:53 -0400
Subject: [PATCH] Move generic configuration file

---
 dist/arch/PKGBUILD         | 2 +-
 dist/arch/PKGBUILD-git     | 2 +-
 dist/{arch => }/config.php | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename dist/{arch => }/config.php (100%)

diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD
index dd35407..48a6dc3 100644
--- a/dist/arch/PKGBUILD
+++ b/dist/arch/PKGBUILD
@@ -47,7 +47,7 @@ package() {
     # copy files requiring special permissions
     cd "$srcdir/arsse"
     install -Dm755 dist/arsse "$pkgdir/usr/bin/arsse"
-    install -Dm640 dist/arch/config.php "$pkgdir/etc/webapps/arsse"
+    install -Dm640 dist/config.php "$pkgdir/etc/webapps/arsse"
     # patch generic configuration files to use Arch-specific paths and identifiers
     sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" "$pkgdir/usr/lib/systemd/system/"* "$pkgdir/usr/bin/"*
     sed -i -se 's/\/var\/run\/php\//\/run\/php-fpm\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf"
diff --git a/dist/arch/PKGBUILD-git b/dist/arch/PKGBUILD-git
index bb43eb4..4249f0a 100644
--- a/dist/arch/PKGBUILD-git
+++ b/dist/arch/PKGBUILD-git
@@ -63,7 +63,7 @@ package() {
     # copy files requiring special permissions
     cd "$srcdir/arsse"
     install -Dm755 dist/arsse "$pkgdir/usr/bin/arsse"
-    install -Dm640 dist/arch/config.php "$pkgdir/etc/webapps/arsse"
+    install -Dm640 dist/config.php "$pkgdir/etc/webapps/arsse"
     # patch generic configuration files to use Arch-specific paths and identifiers
     sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" "$pkgdir/usr/lib/systemd/system/"* "$pkgdir/usr/bin/"*
     sed -i -se 's/\/var\/run\/php\//\/run\/php-fpm\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf"
diff --git a/dist/arch/config.php b/dist/config.php
similarity index 100%
rename from dist/arch/config.php
rename to dist/config.php