From 1a063c92ab5e3454a5333cb8b5db7d405be166e2 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 19 Oct 2019 00:40:23 +0300
Subject: Bump version to 1.1.2 in mix.exs

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index 56a3bfb3c..fb72a22ed 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("1.1.1"),
+      version: version("1.1.2"),
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
-- 
cgit v1.2.3


From 59d447d5558ee88fa1ad479b87d14b7276547fb8 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 19 Oct 2019 00:37:39 +0300
Subject: 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 758d53ec4..afbe7f91b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [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
-- 
cgit v1.2.3