diff options
| author | tusooa <tusooa@kazv.moe> | 2024-05-25 00:54:17 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2024-05-25 00:54:17 +0000 |
| commit | 19b2637c5165d98775d79b156475b2038c25e127 (patch) | |
| tree | 948cca215cbbb20f0edecd4edb7b82669ad4ce9b | |
| parent | 134f3bff6702333ea4b7d2e0e82391bbdf9c727e (diff) | |
| parent | 818712f99f165011aaaad5fd82c40304004ace23 (diff) | |
| download | pleroma-19b2637c5165d98775d79b156475b2038c25e127.tar.gz pleroma-19b2637c5165d98775d79b156475b2038c25e127.zip | |
Merge branch 'bugfix/realpath-over-readlink' into 'develop'
pleroma_ctl: Use realpath(1) instead of readlink(1)
See merge request pleroma/pleroma!4118
| -rw-r--r-- | changelog.d/realpath-over-readlink.fix | 1 | ||||
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/realpath-over-readlink.fix b/changelog.d/realpath-over-readlink.fix new file mode 100644 index 000000000..479561b95 --- /dev/null +++ b/changelog.d/realpath-over-readlink.fix @@ -0,0 +1 @@ +pleroma_ctl: Use realpath(1) instead of readlink(1) diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 87c486514..6f0dba3a8 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -134,7 +134,7 @@ if [ -z "$1" ] || [ "$1" = "help" ]; then " else - SCRIPT=$(readlink -f "$0") + SCRIPT=$(realpath "$0") SCRIPTPATH=$(dirname "$SCRIPT") FULL_ARGS="$*" |