diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-04-24 16:59:00 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-04-24 20:04:33 +0200 |
| commit | ae1bfa1ffefb469cf071565c3f57906c4e8d0feb (patch) | |
| tree | dc2878b1c27525230ee78b85b7703053f3268b0c /loolwsd-generate-proof-key | |
| parent | 6e7977bbb8396f205a3f3e697a81d00a5e835f83 (diff) | |
Proof: fixed a typo, and handled the case when the script is running from rootless docker
Change-Id: I6decbad624dfb2aa1b89e28ca9271d5da442507c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92864
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'loolwsd-generate-proof-key')
| -rwxr-xr-x | loolwsd-generate-proof-key | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/loolwsd-generate-proof-key b/loolwsd-generate-proof-key index 1abbab78f..8b9b336a2 100755 --- a/loolwsd-generate-proof-key +++ b/loolwsd-generate-proof-key @@ -1,12 +1,14 @@ #!/bin/bash SUDO='' -if (( $EUID != 0 )); then - if hash sudo 2>/dev/null; then - SUDO='sudo' - else - "Run the script as root." - exit 1 +if [ ! -w "/etc/loolwsd" ]; then + if (( $EUID != 0 )); then + if hash sudo 2>/dev/null; then + SUDO='sudo' + else + echo "Run the script as root." + exit 1 + fi fi fi |