Move config and cache to proper directories

2 files changed, 30 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6162252af77f..7c824d3599fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = shlink
 	pkgdesc = The definitive self-hosted URL shortener
 	pkgver = 3.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://shlink.io
 	install = shlink.install
 	arch = any
@@ -18,7 +18,7 @@ pkgbase = shlink
 	optdepends = apache: web server
 	optdepends = nginx: web server
 	options = !strip
-	backup = usr/share/webapps/shlink/config/params/generated_config.php
+	backup = etc/webapps/shlink/generated_config.php
 	source = https://github.com/shlinkio/shlink/releases/download/v3.4.0/shlink3.4.0_php8.1_dist.zip
 	sha256sums = e37e91cd86a8d495952783d1eeb94f157ddfe42f50849a3c2f979b1f9d991963
 
diff --git a/PKGBUILD b/PKGBUILD
index cf27f8355150..b4ab9437a5e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: AlphaJack <alphajack at tuta dot io>
+# Maintainer: Justin Kromlinger <hashworks@archlinux.org>
 
 pkgname="shlink"
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The definitive self-hosted URL shortener"
 url="https://shlink.io"
 license=("MIT")
@@ -15,23 +16,37 @@ optdepends=("mariadb: database"
             "sqlite: database"
             "apache: web server"
             "nginx: web server")
-source=("https://github.com/shlinkio/shlink/releases/download/v$pkgver/$pkgname${pkgver}_php8.1_dist.zip")
+source=("https://github.com/shlinkio/shlink/releases/download/v${pkgver}/${pkgname}${pkgver}_php8.1_dist.zip")
 sha256sums=('e37e91cd86a8d495952783d1eeb94f157ddfe42f50849a3c2f979b1f9d991963')
 install="$pkgname.install"
 options=("!strip")
-backup=("usr/share/webapps/shlink/config/params/generated_config.php")
+backup=("etc/webapps/shlink/generated_config.php")
 
 # https://wiki.archlinux.org/title/DeveloperWiki:UID_/_GID_Database
 _http_uid_gid=33
 
-package(){
- cd "$pkgname${pkgver}_php8.1_dist"
- install -d "$pkgdir/usr/share/webapps/$pkgname"
- cp -r * "$pkgdir/usr/share/webapps/$pkgname"
- install -d "data" "$pkgdir/usr/share/webapps/$pkgname/data"
- chown -R "${_http_uid_gid}:${_http_uid_gid}" "$pkgdir/usr/share/webapps/$pkgname/data"
- install -d -o "${_http_uid_gid}" -g "${_http_uid_gid}" -m 750 "config/params" "$pkgdir/usr/share/webapps/$pkgname/config/params"
- install -D -d -o "${_http_uid_gid}" -g "${_http_uid_gid}" -m 750 "$pkgdir/var/log/$pkgname"
- rm -r "$pkgdir/usr/share/webapps/$pkgname/data/log"
- ln -s "/var/log/$pkgname" "$pkgdir/usr/share/webapps/$pkgname/data/log"
+package() {
+    cd "${pkgname}${pkgver}_php8.1_dist"
+    install -d "${pkgdir}/usr/share/webapps/${pkgname}"
+    cp -r ./* "${pkgdir}/usr/share/webapps/${pkgname}"
+    install -d "data" "${pkgdir}/usr/share/webapps/${pkgname}/data"
+    chown -R "${_http_uid_gid}:${_http_uid_gid}" "${pkgdir}/usr/share/webapps/${pkgname}/data"
+
+    install -D -d -o "${_http_uid_gid}" -g "${_http_uid_gid}" -m 750 "${pkgdir}/var/log/${pkgname}"
+    rm -Rf "${pkgdir}/usr/share/webapps/${pkgname}/data/log"
+    ln -s "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/data/log"
+
+    install -d -o "${_http_uid_gid}" -g "${_http_uid_gid}" -m 750 "config/params" "${pkgdir}/etc/webapps/${pkgname}"
+    rm -Rf "${pkgdir}/usr/share/webapps/${pkgname}/config/params"
+    ln -s "/etc/webapps/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/config/params"
+
+    install -D -d -o "${_http_uid_gid}" -g "${_http_uid_gid}" -m 750 "${pkgdir}/var/cache/${pkgname}"
+    rm -Rf "${pkgdir}/usr/share/webapps/${pkgname}/data/cache"
+    ln -s "/var/cache/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/data/cache"
+
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm "${pkgdir}/usr/share/webapps/${pkgname}/LICENSE"
+
+    install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+    rm "${pkgdir}/usr/share/webapps/${pkgname}/README.md"
 }