mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 05:02:40 +00:00
Code Issues Activity

Address case where user is already arsse

Browse source
This commit is contained in:
J. King 2024-01-10 11:00:08 -05:00
parent b1154359e4
commit 8834a65e4c
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,4 +1,4 @@
Version 0.10.5 (2024-01-09) Version 0.10.5 (2024-01-10)
=========================== ===========================
Changes: Changes:
@ -81,7 +81,7 @@ Bug fixes:
- Further relax Fever HTTP correctness, to fix more clients - Further relax Fever HTTP correctness, to fix more clients
- Use icons specified in Atom feeds when available - Use icons specified in Atom feeds when available
- Do not return null as subscription unread count - Do not return null as subscription unread count
- Explicitly forbid U+003A COLON and control characters in usernames, for - Explicitly forbid U+003A COLON and control characters in usernames, for
compatibility with RFC 7617 compatibility with RFC 7617
- Never return 401 in response to an OPTIONS request - Never return 401 in response to an OPTIONS request
- Accept "t" and "f" as booleans in Tiny Tiny RSS - Accept "t" and "f" as booleans in Tiny Tiny RSS

2
RoboFile.php
View file

@ -517,7 +517,7 @@ class RoboFile extends \Robo\Tasks {
} elseif (in_array("item", $expected) && preg_match('/^- (\w.*)$/D', $l, $m)) { } elseif (in_array("item", $expected) && preg_match('/^- (\w.*)$/D', $l, $m)) {
$entry[$section][] = $m[1]; $entry[$section][] = $m[1];
$expected = ["item", "continuation", "blank line"]; $expected = ["item", "continuation", "blank line"];
} elseif (in_array("continuation", $expected) && preg_match('/^ (\w.*)$/D', $l, $m)) { } elseif (in_array("continuation", $expected) && preg_match('/^ (\S.*)$/D', $l, $m)) {
$last = sizeof($entry[$section]) - 1; $last = sizeof($entry[$section]) - 1;
$entry[$section][$last] .= "\n".$m[1]; $entry[$section][$last] .= "\n".$m[1];
} else { } else {

6
dist/arch/arsse vendored
View file

@ -11,13 +11,15 @@ check_sudo() {
} }
# allow overriding the php executable # allow overriding the php executable
if [[ -n "${ARSSE_PHP}" ]] && command -v "${ARSSE_PHP}" > /dev/null; then if [ -n "${ARSSE_PHP}" ] && command -v "${ARSSE_PHP}" > /dev/null; then
php="${ARSSE_PHP}" php="${ARSSE_PHP}"
else else
php="${default_php}" php="${default_php}"
fi fi
if [[ "${UID}" -eq 0 ]]; then if [ "$(whoami)" = "arsse" ]; then
"$php" /usr/share/webapps/arsse/arsse "$@"
elif [ "${UID}" -eq 0 ]; then
runuser -u "arsse" -- "$php" /usr/share/webapps/arsse/arsse "$@" runuser -u "arsse" -- "$php" /usr/share/webapps/arsse/arsse "$@"
else else
check_sudo check_sudo