From 6a3ed5d519b6670ddccbf8bb326ce51b424c9799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=BCttner?= Date: Thu, 24 Jan 2019 16:24:00 +0100 Subject: [PATCH] Added macOS to the docker sudo exception --- deployment/fedora-package-x64/clean.sh | 3 ++- deployment/fedora-package-x64/package.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployment/fedora-package-x64/clean.sh b/deployment/fedora-package-x64/clean.sh index 001f568dd..d7233208f 100755 --- a/deployment/fedora-package-x64/clean.sh +++ b/deployment/fedora-package-x64/clean.sh @@ -8,7 +8,8 @@ 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:-1000} -eq 0 ] && [ ! $USER == "root" ]; then +if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \ + [ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then docker_sudo=sudo fi diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh index 694224006..d459cdb24 100755 --- a/deployment/fedora-package-x64/package.sh +++ b/deployment/fedora-package-x64/package.sh @@ -19,7 +19,8 @@ pkg_src_dir="`pwd`/pkg-src" current_user="`whoami`" image_name="jellyfin-rpmbuild" docker_sudo="" -if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && [ ! $USER == "root" ]; then +if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \ + [ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then docker_sudo=sudo fi