From 9eabfd0f270722839e63de391058e3f8f5d48736 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Sun, 23 May 2021 19:01:51 -0400 Subject: [PATCH] Fix up sed usage in PKGBUILD --- dist/arch/PKGBUILD | 10 +++--- dist/arch/PKGBUILD-git | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 dist/arch/PKGBUILD-git diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index 7c29136..064a8b4 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -46,11 +46,11 @@ package() { cd "$pkgdir" # copy files requiring special permissions cd "$srcdir/arsse" - install -Dm755 dist/arsse "$pkgdir/usr/bin" + install -Dm755 dist/arsse "$pkgdir/usr/bin/arsse" install -Dm640 dist/arch/config.php "$pkgdir/etc/webapps/arsse" # patch generic configuration files to use Arch-specific paths and identifiers - sed -ise 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//' "$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 -ise 's/\/var\/run\/php\//\/run\/php-fpm\//' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf" - sed -ise 's/www-data/http/' "$pkgdir/etc/php/php-fpm.d/arsse.conf" - sed -ie 's/^WorkingDirectory=.*$/WorkingDirectory=\/usr\/share\/webapps\/arsse/' -e 's/^ConfigurationDirectory=.*$/ConfigurationDirectory=webapps\/arsse/' "$pkgdir/usr/lib/systemd/system/arsse-fetch.service" + sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//' "$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\//' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf" + sed -i -se 's/www-data/http/' "$pkgdir/etc/php/php-fpm.d/arsse.conf" + sed -i -e 's/^WorkingDirectory=.*$/WorkingDirectory=\/usr\/share\/webapps\/arsse/' -e 's/^ConfigurationDirectory=.*$/ConfigurationDirectory=webapps\/arsse/' "$pkgdir/usr/lib/systemd/system/arsse-fetch.service" } diff --git a/dist/arch/PKGBUILD-git b/dist/arch/PKGBUILD-git new file mode 100644 index 0000000..943cf51 --- /dev/null +++ b/dist/arch/PKGBUILD-git @@ -0,0 +1,72 @@ +# Maintainer: J. King +pkgname="arsse-git" +pkgver=0.9.1.r44.g0236b42 +pkgrel=1 +epoch= +pkgdesc="Multi-protocol RSS/Atom newsfeed synchronization server" +arch=("any") +url="https://thearsse.com/" +license=("MIT") +provides=("arsse") +conflicts=("arsse") +depends=("php" "php-intl" "php-sqlite") +makedepends=("composer") +checkdepends=() +optdepends=("nginx: HTTP server" + "apache: HTTP server" + "percona-server: Alternate database" + "postgresql: Alternate database" + "php-pgsql: PostgreSQL database support") +backup=("etc/webapps/arsse/config.php" + "etc/php/php-fpm.d/arsse.conf" + "etc/webapps/arsse/nginx/example.conf" + "etc/webapps/arsse/nginx/arsse.conf" + "etc/webapps/arsse/nginx/arsse-loc.conf" + "etc/webapps/arsse/nginx/arsse-fcgi.conf" + "etc/webapps/arsse/apache/example.conf" + "etc/webapps/arsse/apache/arsse.conf" + "etc/webapps/arsse/apache/arsse-loc.conf") +source=("git+https://code.mensbeam.com/MensBeam/arsse/") +md5sums=("SKIP") + +pkgver() { + cd "arsse" + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + cd "$srcdir/arsse" + composer install + ./robo manual + composer install --no-dev -o --no-scripts + php arsse.php conf save-defaults config.defaults.php + rm -r vendor/bin +} + +package() { + # define runtime dependencies + depends=("php" "php-intl" "php-sqlite" "php-fpm") + # create most directories necessary for the final package + cd "$pkgdir" + mkdir -p "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "usr/lib/tmpfiles.d" "etc/php/php-fpm.d/" "etc/webapps/arsse" "etc/webapps/arsse/nginx" + #copy requisite files + cd "$srcdir/arsse" + cp -r lib locale sql vendor www CHANGELOG UPGRADING README.md arsse.php "$pkgdir/usr/share/webapps/arsse" + cp -r manual/* "$pkgdir/usr/share/doc/arsse" + cp LICENSE AUTHORS "$pkgdir/usr/share/licenses/arsse" + cp dist/systemd/* "$pkgdir/usr/lib/systemd/system" + cp dist/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf" + cp dist/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" + cp dist/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf" + cp -r dist/nginx dist/apache config.defaults.php "$pkgdir/etc/webapps/arsse" + cd "$pkgdir" + # 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" + # patch generic configuration files to use Arch-specific paths and identifiers + sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//' "$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\//' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf" + sed -i -se 's/www-data/http/' "$pkgdir/etc/php/php-fpm.d/arsse.conf" + sed -i -e 's/^WorkingDirectory=.*$/WorkingDirectory=\/usr\/share\/webapps\/arsse/' -e 's/^ConfigurationDirectory=.*$/ConfigurationDirectory=webapps\/arsse/' "$pkgdir/usr/lib/systemd/system/arsse-fetch.service" +}