From cda92f0ffcc1152429825fb0230559af8b899079 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sat, 19 Dec 2020 22:31:50 +0000 Subject: [PATCH] Fix css compilation for gmod-loadscreen --- configs/nginx/APKBUILD | 6 +++--- configs/nginx/main.conf | 1 + data/cherry-gmod/APKBUILD | 13 +++++++++---- data/homepage/APKBUILD | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/configs/nginx/APKBUILD b/configs/nginx/APKBUILD index 4ccddbd..dca5582 100644 --- a/configs/nginx/APKBUILD +++ b/configs/nginx/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-nginx -pkgver=2020.12.18 -pkgrel=2 +pkgver=2020.12.19 +pkgrel=0 pkgdesc="NGINX configuration" url="https://git.redxen.eu/RedXen" arch="noarch" @@ -41,7 +41,7 @@ check() { nginx -p / -c main.conf -t } -sha512sums="e8ddde3d82074026dc08d9a2fecf5893cd946fdbc7a9163af372015e285a750947b41f7c7e05b11f8eea8b599c2746743e6008459aa71f499d730073bb2b2e18 main.conf +sha512sums="a24873ff4a79c27ae15bcd09c6667aecb1f8c657759ba2914ace780bd5c68822d175637c87001c375e4460b941b0d3c3b07abf13a114fb057983e07b0b501eae main.conf abba14b4ed423455d9a6993b48f44c3464e37dc6a05119b3084d0519bbc62c7551cee721c25f0543b67ed80425c71dbe0ef5d3f8c9436faf7706d6d18414b149 seedbox.conf 0f378efcd72933ee0c44be2e2e150ad49e5019df1fb06485aa31f0690530932dff68876678dbfa5b1757f23d14d9ee779cfd0f16eadf7fb17881fa26d987738c alpine.conf c35ffedd042aba924e02ba028dd84449c091352abfe7ea0f69f3031ee8ba0dc62498a42cab6c3e9bfd60205f4efe7d09537933095f966c7d4e139cd94d5022aa homepage.conf" diff --git a/configs/nginx/main.conf b/configs/nginx/main.conf index 5a63e64..9d42717 100644 --- a/configs/nginx/main.conf +++ b/configs/nginx/main.conf @@ -9,6 +9,7 @@ http { gzip_vary on; tcp_nopush on; tcp_nodelay on; + absolute_redirect off; keepalive_timeout 300; include /etc/nginx/mime.types; default_type application/octet-stream; diff --git a/data/cherry-gmod/APKBUILD b/data/cherry-gmod/APKBUILD index a108363..5623621 100644 --- a/data/cherry-gmod/APKBUILD +++ b/data/cherry-gmod/APKBUILD @@ -1,23 +1,28 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-data-cherry-gmod -pkgver=2020.10.18 -pkgrel=0 +pkgver=2020.12.19 +pkgrel=1 _commit="ae7a7a01579178da91bb176e744d3d90d9b2e484" pkgdesc="Cherry's loading screen files" url="https://git.redxen.eu/IPTG/GMOD-Loadscreen" arch="noarch" license="none" depends="redxen-config-nginx-homepage" +makedepends="nodejs-less" options="!check" # No checks possible source=" https://git.redxen.eu/IPTG/GMOD-Loadscreen/archive/$_commit.tar.gz " -builddir="$srcdir" +builddir="$srcdir/gmod-loadscreen" + +build() { + lessc css/main.less > css/main.css +} package() { mkdir -p "$pkgdir"/http/pub - mv "$builddir"/gmod-loadscreen "$pkgdir"/http/pub/cherry + mv "$builddir" "$pkgdir"/http/pub/cherry chown -Rv root:www-data "$pkgdir"/http } diff --git a/data/homepage/APKBUILD b/data/homepage/APKBUILD index 540cf0b..5ba5514 100644 --- a/data/homepage/APKBUILD +++ b/data/homepage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-data-homepage -pkgver=2020.12.18 +pkgver=2020.12.19 pkgrel=0 _commit="ccffc104aeb298b8192b6d3174d4f8d9cccd3f3c" pkgdesc="Homepage files" @@ -21,7 +21,7 @@ build() { package() { mkdir -p "$pkgdir" - mv "$srcdir"/homepage/ "$pkgdir"/http + mv "$builddir" "$pkgdir"/http chown -Rv root:www-data "$pkgdir"/http }