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/debian-package-armhf | |
| 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/debian-package-armhf')
| -rwxr-xr-x | deployment/debian-package-armhf/docker-build.sh | 1 | ||||
| -rwxr-xr-x | deployment/debian-package-armhf/package.sh | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment/debian-package-armhf/docker-build.sh b/deployment/debian-package-armhf/docker-build.sh index 45e68f0c6b..56227b5880 100755 --- a/deployment/debian-package-armhf/docker-build.sh +++ b/deployment/debian-package-armhf/docker-build.sh @@ -18,3 +18,4 @@ dpkg-buildpackage -us -uc -aarmhf # Move the artifacts out mkdir -p ${ARTIFACT_DIR}/deb mv /jellyfin_* ${ARTIFACT_DIR}/deb/ +chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} diff --git a/deployment/debian-package-armhf/package.sh b/deployment/debian-package-armhf/package.sh index 0ec0dc95cf..4393fb8340 100755 --- a/deployment/debian-package-armhf/package.sh +++ b/deployment/debian-package-armhf/package.sh @@ -30,13 +30,12 @@ case $ARCH in ;; esac +# Prepare temporary package dir +mkdir -p "${package_temporary_dir}" # Set up the build environment Docker image ${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE} # Build the DEBs and copy out to ${package_temporary_dir} ${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" -# Correct ownership on the DEBs (as current user, then as root if that fails) -chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null \ - || sudo chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null # Move the DEBs to the output directory mkdir -p "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}" |
