diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
| commit | 791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a (patch) | |
| tree | 98ebe750f99cb6be2532e9dbaf3b334957353777 /rel | |
| parent | 8eff05d4c62c4d3300fee173cad84f75a0aafb4d (diff) | |
| parent | 060adfd762a5183b3cc5f51e041819b24b8430d2 (diff) | |
| download | pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.tar.gz | |
Merge branch 'develop' into feature/store-statuses-data-inside-flag
Diffstat (limited to 'rel')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 90f87a990..87c486514 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -140,12 +140,16 @@ else FULL_ARGS="$*" ACTION="$1" - shift - - if [ "$(echo \"$1\" | grep \"^-\" >/dev/null)" = false ]; then - SUBACTION="$1" + if [ $# -gt 0 ]; then shift fi + echo "$1" | grep "^-" >/dev/null + if [ $? -eq 1 ]; then + SUBACTION="$1" + if [ $# -gt 0 ]; then + shift + fi + fi if [ "$ACTION" = "update" ]; then update "$@" |