Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix passing web branch

Browse Source
This commit is contained in:
Vasily 2020-04-14 14:33:27 +03:00
parent dbbf97e588
commit 99e22c499d
19 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build
View File

@ -81,7 +81,14 @@ if [[ $1 == '-b' || $1 == '--web-branch' ]]; then
web_branch="$2" web_branch="$2"
shift 2 shift 2
else else
web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" web_branch="$( git describe --tags --exact-match || true )"
if [[ -z "$web_branch" ]]; then
web_branch="$( git branch 2>/dev/null | grep -v 'HEAD detached' | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )"
if [[ -z "${web_branch}" ]]; then
echo "Cannot determine web branch, pass it explicitly via --web-branch option"
exit 1
fi
fi
fi fi
# Parse platform option # Parse platform option

4
deployment/centos-package-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the RPMs and copy out to ${package_temporary_dir} # Build the RPMs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the RPMs to the output directory # Move the RPMs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/rpm/* "${output_dir}" mv "${package_temporary_dir}"/rpm/* "${output_dir}"

4
deployment/debian-package-arm64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
ARCH="$( arch )" ARCH="$( arch )"
@ -39,7 +39,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE} ${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE}
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

4
deployment/debian-package-armhf/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
ARCH="$( arch )" ARCH="$( arch )"
@ -39,7 +39,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE} ${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE}
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

4
deployment/debian-package-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

4
deployment/fedora-package-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the RPMs and copy out to ${package_temporary_dir} # Build the RPMs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the RPMs to the output directory # Move the RPMs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/rpm/* "${output_dir}" mv "${package_temporary_dir}"/rpm/* "${output_dir}"

2
deployment/linux-x64/docker-build.sh
View File

@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
pushd ${web_build_dir} pushd ${web_build_dir}
git checkout tags/v10.5.3 git checkout "${web_branch}"
yarn install yarn install
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/

4
deployment/linux-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/* "${output_dir}" mv "${package_temporary_dir}"/* "${output_dir}"

2
deployment/macos/docker-build.sh
View File

@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
pushd ${web_build_dir} pushd ${web_build_dir}
git checkout tags/v10.5.3 git checkout "${web_branch}"
yarn install yarn install
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/

4
deployment/macos/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/* "${output_dir}" mv "${package_temporary_dir}"/* "${output_dir}"

2
deployment/portable/docker-build.sh
View File

@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
pushd ${web_build_dir} pushd ${web_build_dir}
git checkout tags/v10.5.3 git checkout "${web_branch}"
yarn install yarn install
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/

4
deployment/portable/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/* "${output_dir}" mv "${package_temporary_dir}"/* "${output_dir}"

4
deployment/ubuntu-package-arm64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
ARCH="$( arch )" ARCH="$( arch )"
@ -39,7 +39,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE} ${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE}
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

4
deployment/ubuntu-package-armhf/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
ARCH="$( arch )" ARCH="$( arch )"
@ -39,7 +39,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE} ${docker_sudo} docker build ../.. -t "${image_name}" -f ./${DOCKERFILE}
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

4
deployment/ubuntu-package-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/deb/* "${output_dir}" mv "${package_temporary_dir}"/deb/* "${output_dir}"

2
deployment/win-x64/docker-build.sh
View File

@ -19,7 +19,7 @@ web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
pushd ${web_build_dir} pushd ${web_build_dir}
git checkout tags/v10.5.3 git checkout "${web_branch}"
yarn install yarn install
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/

4
deployment/win-x64/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/* "${output_dir}" mv "${package_temporary_dir}"/* "${output_dir}"

2
deployment/win-x86/docker-build.sh
View File

@ -19,7 +19,7 @@ web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
pushd ${web_build_dir} pushd ${web_build_dir}
git checkout tags/v10.5.3 git checkout "${web_branch}"
yarn install yarn install
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/

4
deployment/win-x86/package.sh
View File

@ -3,7 +3,7 @@
args="${@}" args="${@}"
declare -a docker_envvars declare -a docker_envvars
for arg in ${args}; do for arg in ${args}; do
docker_envvars+=("-e ${arg}") docker_envvars+="-e ${arg} "
done done
WORKDIR="$( pwd )" WORKDIR="$( pwd )"
@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
# Set up the build environment Docker image # Set up the build environment Docker image
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile ${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
# Build the DEBs and copy out to ${package_temporary_dir} # Build the DEBs and copy out to ${package_temporary_dir}
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}" ${docker_envvars} ${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
# Move the DEBs to the output directory # Move the DEBs to the output directory
mkdir -p "${output_dir}" mkdir -p "${output_dir}"
mv "${package_temporary_dir}"/* "${output_dir}" mv "${package_temporary_dir}"/* "${output_dir}"