diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:34:40 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:34:40 +0100 |
| commit | ca320ba7acbd1018eba7816fac9271172e91ed1d (patch) | |
| tree | 31a0e863dab32fb5a887a1b333f42c5ed59ff71d | |
| parent | ae0732136fe72e5e3c26517e9e350178bf2e9b59 (diff) | |
Sudo fix for debian and fedora.
| -rwxr-xr-x | deployment/debian-package-x64/package.sh | 8 | ||||
| -rwxr-xr-x | deployment/fedora-package-x64/package.sh | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/deployment/debian-package-x64/package.sh b/deployment/debian-package-x64/package.sh index 7909b0a84..dec953961 100755 --- a/deployment/debian-package-x64/package.sh +++ b/deployment/debian-package-x64/package.sh @@ -25,9 +25,7 @@ docker build ../.. -t "$image_name" -f ./Dockerfile --build-arg SOURCEDIR="/jell mkdir -p "$package_temporary_dir" mkdir -p "$output_dir" docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find / -maxdepth 1 -type f -name "jellyfin*" -exec mv {} /temp \;' -chown -R "$current_user" "$package_temporary_dir" -if [ $? -ne 0 ]; then - # Some platforms need this to chown the file properly. (Platforms with native docker, not just the client) - sudo chown -R "$current_user" "$package_temporary_dir" -fi +chown -R "$current_user" "$package_temporary_dir" \ +|| sudo chown -R "$current_user" "$package_temporary_dir" + mv "$package_temporary_dir"/* "$output_dir" diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh index 56a120844..416c8213b 100755 --- a/deployment/fedora-package-x64/package.sh +++ b/deployment/fedora-package-x64/package.sh @@ -78,9 +78,6 @@ fi docker build ../.. -t "$image_name" -f ./Dockerfile mkdir -p "$output_dir" docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;' -chown -R "$current_user" "$package_temporary_dir" -if [ $? -ne 0 ]; then - # Some platforms need this to chown the file properly. (Platforms with native docker, not just the client) - sudo chown -R "$current_user" "$package_temporary_dir" -fi +chown -R "$current_user" "$package_temporary_dir" \ +|| sudo chown -R "$current_user" "$package_temporary_dir" mv "$package_temporary_dir"/*.rpm "$output_dir" |