Fix passing web branch

19 files changed, 39 insertions, 32 deletions

diff --git a/build b/build
index 95d5d5c495..c1b3ca4464 100755
--- a/build
+++ b/build
@@ -81,7 +81,14 @@ if [[ $1 == '-b' || $1 == '--web-branch' ]]; then
 	web_branch="$2"
 	shift 2
 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
 
 # Parse platform option
diff --git a/deployment/centos-package-x64/package.sh b/deployment/centos-package-x64/package.sh
index 1b983f49d9..248437617e 100755
--- a/deployment/centos-package-x64/package.sh
+++ b/deployment/centos-package-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
 # Set up the build environment Docker image
 ${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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the RPMs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/rpm/* "${output_dir}"
diff --git a/deployment/debian-package-arm64/package.sh b/deployment/debian-package-arm64/package.sh
index 2091982187..a4ab6ab78c 100755
--- a/deployment/debian-package-arm64/package.sh
+++ b/deployment/debian-package-arm64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 ARCH="$( arch )"
@@ -39,7 +39,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/debian-package-armhf/package.sh b/deployment/debian-package-armhf/package.sh
index 4a27dd8283..aca79e86e1 100755
--- a/deployment/debian-package-armhf/package.sh
+++ b/deployment/debian-package-armhf/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 ARCH="$( arch )"
@@ -39,7 +39,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/debian-package-x64/package.sh b/deployment/debian-package-x64/package.sh
index 5a416959ab..3669f92dcf 100755
--- a/deployment/debian-package-x64/package.sh
+++ b/deployment/debian-package-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh
index ae6962dd1f..d5739d6bbd 100755
--- a/deployment/fedora-package-x64/package.sh
+++ b/deployment/fedora-package-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ mkdir -p "${package_temporary_dir}"
 # Set up the build environment Docker image
 ${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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the RPMs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/rpm/* "${output_dir}"
diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh
index 979d8ca429..474597a9f0 100755
--- a/deployment/linux-x64/docker-build.sh
+++ b/deployment/linux-x64/docker-build.sh
@@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
 git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
 pushd ${web_build_dir}
-git checkout tags/v10.5.3
+git checkout "${web_branch}"
 yarn install
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
diff --git a/deployment/linux-x64/package.sh b/deployment/linux-x64/package.sh
index dfe8a9aa4a..7f00f038ac 100755
--- a/deployment/linux-x64/package.sh
+++ b/deployment/linux-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/* "${output_dir}"
diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh
index 5092d61198..62f1bb132a 100755
--- a/deployment/macos/docker-build.sh
+++ b/deployment/macos/docker-build.sh
@@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
 git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
 pushd ${web_build_dir}
-git checkout tags/v10.5.3
+git checkout "${web_branch}"
 yarn install
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
diff --git a/deployment/macos/package.sh b/deployment/macos/package.sh
index 464c0d382f..70ae91a84c 100755
--- a/deployment/macos/package.sh
+++ b/deployment/macos/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/* "${output_dir}"
diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh
index 0ba2088c8e..3a10e3dc3c 100755
--- a/deployment/portable/docker-build.sh
+++ b/deployment/portable/docker-build.sh
@@ -13,7 +13,7 @@ web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
 git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
 pushd ${web_build_dir}
-git checkout tags/v10.5.3
+git checkout "${web_branch}"
 yarn install
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
diff --git a/deployment/portable/package.sh b/deployment/portable/package.sh
index 0ceb54dda1..08c2bc2516 100755
--- a/deployment/portable/package.sh
+++ b/deployment/portable/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/* "${output_dir}"
diff --git a/deployment/ubuntu-package-arm64/package.sh b/deployment/ubuntu-package-arm64/package.sh
index d1140a7274..5d4f700a6d 100755
--- a/deployment/ubuntu-package-arm64/package.sh
+++ b/deployment/ubuntu-package-arm64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 ARCH="$( arch )"
@@ -39,7 +39,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/ubuntu-package-armhf/package.sh b/deployment/ubuntu-package-armhf/package.sh
index 2ceb3e8165..1100b3b482 100755
--- a/deployment/ubuntu-package-armhf/package.sh
+++ b/deployment/ubuntu-package-armhf/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 ARCH="$( arch )"
@@ -39,7 +39,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/ubuntu-package-x64/package.sh b/deployment/ubuntu-package-x64/package.sh
index 08c003778b..097f63cf17 100755
--- a/deployment/ubuntu-package-x64/package.sh
+++ b/deployment/ubuntu-package-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/deb/* "${output_dir}"
diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh
index 607b3eba16..18f32a3828 100755
--- a/deployment/win-x64/docker-build.sh
+++ b/deployment/win-x64/docker-build.sh
@@ -19,7 +19,7 @@ web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
 git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
 pushd ${web_build_dir}
-git checkout tags/v10.5.3
+git checkout "${web_branch}"
 yarn install
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
diff --git a/deployment/win-x64/package.sh b/deployment/win-x64/package.sh
index a8ab190fa5..a3de364c39 100755
--- a/deployment/win-x64/package.sh
+++ b/deployment/win-x64/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/* "${output_dir}"
diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh
index 2439a532ca..d560b1459d 100755
--- a/deployment/win-x86/docker-build.sh
+++ b/deployment/win-x86/docker-build.sh
@@ -19,7 +19,7 @@ web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
 git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/
 pushd ${web_build_dir}
-git checkout tags/v10.5.3
+git checkout "${web_branch}"
 yarn install
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
diff --git a/deployment/win-x86/package.sh b/deployment/win-x86/package.sh
index 65e7e2928c..aff4f78a7e 100755
--- a/deployment/win-x86/package.sh
+++ b/deployment/win-x86/package.sh
@@ -3,7 +3,7 @@
 args="${@}"
 declare -a docker_envvars
 for arg in ${args}; do
-    docker_envvars+=("-e ${arg}")
+    docker_envvars+="-e ${arg} "
 done
 
 WORKDIR="$( pwd )"
@@ -28,7 +28,7 @@ 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}" ${docker_envvars}
+${docker_sudo} docker run --rm ${docker_envvars} -v "${package_temporary_dir}:/dist" "${image_name}"
 # Move the DEBs to the output directory
 mkdir -p "${output_dir}"
 mv "${package_temporary_dir}"/* "${output_dir}"