From 4131531bff65dbf9d2ea980fc38a6e048a3677f0 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Fri, 29 Dec 2023 19:42:33 -0500 Subject: [PATCH] Tweaks - Add new files to PKGBUILD backup - Adjust Robo caller to use ARSSE_PHP variable; Windows will need adjusting later --- dist/arch/PKGBUILD | 2 ++ robo | 17 ++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index a84bdf63..10d61ff9 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -16,7 +16,9 @@ optdepends=("nginx: HTTP server" "postgresql>=10: Alternate database" "php-pgsql-interpreter>=7.3: PostgreSQL database support") backup=("etc/webapps/arsse/config.php" + "etc/webapps/arsse/systemd-environment" "etc/php/php-fpm.d/arsse.conf" + "etc/php-legacy/php-fpm.d/arsse.conf" "etc/webapps/arsse/nginx/example.conf" "etc/webapps/arsse/nginx/arsse.conf" "etc/webapps/arsse/nginx/arsse-loc.conf" diff --git a/robo b/robo index 223ad9f1..6cc8c077 100755 --- a/robo +++ b/robo @@ -1,14 +1,17 @@ #! /bin/sh base=`dirname "$0"` -roboCommand="$1" +command="$1" +robo="$base/vendor-bin/robo/vendor/bin/robo" +if [ -z "$ARSSE_PHP" ]; then + php="php" +else + php="$ARSSE_PHP" +fi + if [ $# -eq 0 ]; then - "$base/vendor-bin/robo/vendor/bin/robo" + "$php" "$robo" else shift ulimit -n 2048 - if [ "$1" = "clean" ]; then - "$base/vendor-bin/robo/vendor/bin/robo" "$roboCommand" "$@" - else - "$base/vendor-bin/robo/vendor/bin/robo" "$roboCommand" -- "$@" - fi + "$php" "$robo" "$command" -- "$@" fi