commit: 9b26d1608f5ddd64a146dec3c41b029c1b7a4198
parent bb73f100b8b29d2cbe5573b766166ebb085dcc86
Author: rinpatch <rinpatch@sdf.org>
Date: Fri, 18 Oct 2019 21:44:14 +0000
Merge branch 'release/1.1.2' into 'stable'
1.1.2 Release
See merge request pleroma/pleroma!1863
Diffstat:
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
