diff options
| author | Vasily <just.one.man@yandex.ru> | 2020-04-14 14:33:27 +0300 |
|---|---|---|
| committer | Vasily <just.one.man@yandex.ru> | 2020-04-14 14:33:27 +0300 |
| commit | 99e22c499d64ccd049e14b2440b781df5a8d180f (patch) | |
| tree | 0f1c30d90b1698044d79ebc8d67c883cca7ade35 /deployment/macos | |
| parent | dbbf97e5881ea39da5e9e2b5aa32d45ddd3cd1bc (diff) | |
Fix passing web branch
Diffstat (limited to 'deployment/macos')
| -rwxr-xr-x | deployment/macos/docker-build.sh | 2 | ||||
| -rwxr-xr-x | deployment/macos/package.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh index 5092d6119..62f1bb132 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 464c0d382..70ae91a84 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}" |
