aboutsummaryrefslogtreecommitdiff
path: root/deployment
diff options
context:
space:
mode:
authorBrian J. Murrell <brian@interlinx.bc.ca>2019-02-15 08:50:31 -0500
committerBrian J. Murrell <brian@interlinx.bc.ca>2019-02-15 10:22:52 -0500
commite33706ab251e830b6b8d8bb4ecade81a410a6542 (patch)
treed1b3a42fa12a503da1d0137a6e6524f99bfb4f89 /deployment
parent4018b7e2d506ec5d4f4a5670d198599e2381bd00 (diff)
Code review updates
Also fix a bug in the tarball creation that existed even prior to moving it into create_tarball.sh
Diffstat (limited to 'deployment')
-rwxr-xr-xdeployment/fedora-package-x64/create_tarball.sh8
-rw-r--r--deployment/fedora-package-x64/pkg-src/jellyfin.spec2
2 files changed, 5 insertions, 5 deletions
diff --git a/deployment/fedora-package-x64/create_tarball.sh b/deployment/fedora-package-x64/create_tarball.sh
index 89a3a9475..e8301c989 100755
--- a/deployment/fedora-package-x64/create_tarball.sh
+++ b/deployment/fedora-package-x64/create_tarball.sh
@@ -24,12 +24,12 @@ tar \
--exclude='**/.nuget' \
--exclude='*.deb' \
--exclude='*.rpm' \
--Jcf "$pkg_src_dir/jellyfin-${VERSION}.tar.xz" \
+-czf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
-C "../.." ./ || GNU_TAR=0
if [ $GNU_TAR -eq 0 ]; then
echo "The installed tar binary did not support --transform. Using workaround."
- mkdir -p "${package_temporary_dir}/jellyfin"
+ mkdir -p "${package_temporary_dir}/jellyfin"{,-"${VERSION}"}
# Not GNU tar
tar \
--exclude='.git*' \
@@ -47,9 +47,9 @@ if [ $GNU_TAR -eq 0 ]; then
"${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \
-C "../.." ./
echo "Extracting filtered package."
- tar -Jzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
+ tar -xzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
echo "Removing filtered package."
rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz"
echo "Repackaging package into final tarball."
- tar -Jzf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
+ tar -czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
fi
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index 262b9203a..851c40044 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -12,7 +12,7 @@ Release: 1%{?dist}
Summary: The Free Software Media Browser
License: GPLv2
URL: https://jellyfin.media
-Source0: %{name}-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.gz
Source1: jellyfin.service
Source2: jellyfin.env
Source3: jellyfin.sudoers