Merge branch 'develop' into release-docs

[akkoma] / rel / files / bin / pleroma_ctl

diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl
index 62368115e565fb7116d8b62e34b67505e3359078..9c67b209b95ccff744455e92055e7a7974735304 100755 (executable)
--- a/rel/files/bin/pleroma_ctl
+++ b/rel/files/bin/pleroma_ctl
@@ -2,7 +2,7 @@
 # XXX: This should be removed when elixir's releases get custom command support
 
 detect_flavour() {
-       arch="$(arch)"
+       arch="$(uname -m)"
        if [ "$arch" = "x86_64" ]; then
                arch="amd64"
        elif [ "$arch" = "armv7l" ]; then
@@ -110,7 +110,7 @@ else
 
        if [ "$1" = "update" ]; then
                update "$2"
-       elif [ "$1" = "migrate" ] || [ "$1" = "rollback" ] || [ "$1" = "create" ] || [ -n "$PLEROMA_CTL_RPC_DISABLED" ]; then
+       elif [ "$1" = "migrate" ] || [ "$1" = "rollback" ] || [ "$1" = "create" ] || [ "$1 $2" = "instance gen" ] || [ -n "$PLEROMA_CTL_RPC_DISABLED" ]; then
                "$SCRIPTPATH"/pleroma eval 'Pleroma.ReleaseTasks.run("'"$*"'")'
        else
                "$SCRIPTPATH"/pleroma rpc 'Pleroma.ReleaseTasks.run("'"$*"'")'