diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-05-18 12:56:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 12:56:42 +0200 |
| commit | 2d011b781e8a696bb6dc6cf355d19463f6b9cdb3 (patch) | |
| tree | 8c7e5e3dba3a3e9a831b3951aa15b0768f068508 /deployment/centos-package-x64 | |
| parent | 71f81c5fb0e4f9bcf1242552e0d6df7a88593d3e (diff) | |
| parent | 1bf3a26a6194c6a5878f1e4c98ed953103ac7b71 (diff) | |
Merge pull request #1383 from jellyfin/release-10.3.z
Backmerge for Release 10.3.3
Diffstat (limited to 'deployment/centos-package-x64')
| -rwxr-xr-x | deployment/centos-package-x64/docker-build.sh | 1 | ||||
| -rwxr-xr-x | deployment/centos-package-x64/package.sh | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh index 3acf1ec0df..cefb1652e9 100755 --- a/deployment/centos-package-x64/docker-build.sh +++ b/deployment/centos-package-x64/docker-build.sh @@ -18,3 +18,4 @@ rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg- # Move the artifacts out mkdir -p ${ARTIFACT_DIR}/rpm mv /root/rpmbuild/RPMS/x86_64/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/rpm/ +chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} diff --git a/deployment/centos-package-x64/package.sh b/deployment/centos-package-x64/package.sh index 27d686e46f..df5a665808 100755 --- a/deployment/centos-package-x64/package.sh +++ b/deployment/centos-package-x64/package.sh @@ -72,9 +72,6 @@ fi ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile # Build the RPMs and copy out to ${package_temporary_dir} ${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" -# Correct ownership on the RPMs (as current user, then as root if that fails) -chown -R "${current_user}" "${package_temporary_dir}" \ - || sudo chown -R "${current_user}" "${package_temporary_dir}" # Move the RPMs to the output directory mkdir -p "${output_dir}" mv "${package_temporary_dir}"/rpm/* "${output_dir}" |