From 901bf0fb8c5407a3e74bc782e8eb28eb47dab6ef Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 19 Oct 2019 00:37:39 +0300 Subject: [PATCH] pleroma_ctl: Fix attempting to use RPC for config generation --- CHANGELOG.md | 4 ++++ rel/files/bin/pleroma_ctl | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ebf358ed..4f90f36a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname` +## [1.1.2] - 2019-10-18 +### Fixed +- `pleroma_ctl` trying to connect to a running instance when generating the config, which of course doesn't exist. + ## [1.1.1] - 2019-10-18 ### Fixed - One of the migrations between 1.0.0 and 1.1.0 wiping user info of the relay user because of unexpected behavior of postgresql's `jsonb_set`, resulting in inability to post in the default configuration. If you were affected, please run the following query in postgres console, the relay user will be recreated automatically: diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 90f87a990..9fc5b0bad 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -141,8 +141,8 @@ else ACTION="$1" shift - - if [ "$(echo \"$1\" | grep \"^-\" >/dev/null)" = false ]; then + echo "$1" | grep "^-" >/dev/null + if [ $? -eq 1 ]; then SUBACTION="$1" shift fi