pleroma_ctl: Fix attempting to use RPC for config generation

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebf358edb496532baf68929a6547c8e412296c2..4f90f36a33d37ca49d8f30bef73f5c76cbefd86b 100644 (file)
--- 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`
 </details>
 
+## [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 90f87a9909ed3960976019088645119c8958a917..9fc5b0bad8a0a64ec2ea9ace3887ff79ca95028c 100755 (executable)
--- 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