[Libreoffice-commits] online.git: loolwsd-generate-proof-key

[Andras Timar (via logerrit)]

 loolwsd-generate-proof-key |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit ae1bfa1ffefb469cf071565c3f57906c4e8d0feb
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Apr 24 16:59:00 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Apr 24 20:04:33 2020 +0200

    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 at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

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