From ae1bfa1ffefb469cf071565c3f57906c4e8d0feb Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 24 Apr 2020 16:59:00 +0200 Subject: [PATCH] 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 Reviewed-by: Andras Timar --- loolwsd-generate-proof-key | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/loolwsd-generate-proof-key b/loolwsd-generate-proof-key index 1abbab78f2..8b9b336a24 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