Merge branch 'release/1.1.2' into 'stable'

1.1.2 Release

See merge request pleroma/pleroma!1863

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758d53ec43ce1b66cf4b6a01f0a4160fde2063f7..afbe7f91b18eb8659f609bb2f29b59c38f38b2c0 100644 (file)
--- 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/mix.exs b/mix.exs
index 56a3bfb3cac9abd2d64164df13f6e07788fd57ff..fb72a22ed595eae2da843d52689e6e54904c19a4 100644 (file)
--- 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(),

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