From f2d0d1f646c16cf2099f6395721822bbfa555fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=BCttner?= Date: Thu, 24 Jan 2019 15:24:04 +0100 Subject: [PATCH] Make the docker group check BSD compatible --- deployment/fedora-package-x64/clean.sh | 2 +- deployment/fedora-package-x64/package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/fedora-package-x64/clean.sh b/deployment/fedora-package-x64/clean.sh index d0f487648a..001f568dda 100755 --- a/deployment/fedora-package-x64/clean.sh +++ b/deployment/fedora-package-x64/clean.sh @@ -8,7 +8,7 @@ package_temporary_dir="`pwd`/pkg-dist-tmp" pkg_src_dir="`pwd`/pkg-src" image_name="jellyfin-rpmbuild" docker_sudo="" -if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then +if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && [ ! $USER == "root" ]; then docker_sudo=sudo fi diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh index 390c2d9b70..6942240066 100755 --- a/deployment/fedora-package-x64/package.sh +++ b/deployment/fedora-package-x64/package.sh @@ -19,7 +19,7 @@ pkg_src_dir="`pwd`/pkg-src" current_user="`whoami`" image_name="jellyfin-rpmbuild" docker_sudo="" -if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then +if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && [ ! $USER == "root" ]; then docker_sudo=sudo fi