alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop' 

pleroma_ctl: fix crashes due to different shift(1) behavior on dash

See merge request pleroma/pleroma!1880
This commit is contained in:
kaniini 2019-10-25 00:24:01 +00:00
parent 40a2a92a1f f3451e723b
commit 96cd66ac1b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rel/files/bin/pleroma_ctl
View File

@ -140,12 +140,16 @@ else
FULL_ARGS="$*" FULL_ARGS="$*"
ACTION="$1" ACTION="$1"
if [ $# -gt 0 ]; then
shift shift
fi
echo "$1" | grep "^-" >/dev/null echo "$1" | grep "^-" >/dev/null
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
SUBACTION="$1" SUBACTION="$1"
if [ $# -gt 0 ]; then
shift shift
fi fi
fi
if [ "$ACTION" = "update" ]; then if [ "$ACTION" = "update" ]; then
update "$@" update "$@"