From 36cd6919e025bb62751db28b06f24b99d0c3cd49 Mon Sep 17 00:00:00 2001 From: bashonly Date: Wed, 13 Aug 2025 11:35:20 -0500 Subject: [PATCH] script improvements Authored by: bashonly --- .github/workflows/build.yml | 4 ++-- bundle/docker/linux/entrypoint.sh | 6 ++++-- bundle/docker/linux/verify.sh | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a5ef1aac..9aa189ce1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,7 +240,7 @@ jobs: docker compose down sudo chown "${USER}:docker" ~/build/${EXE_NAME} - - name: Verify --update-to + - name: Verify --update-to in container if: vars.UPDATE_TO_VERIFICATION env: EXE_NAME: yt-dlp_linux_armv7l @@ -305,7 +305,7 @@ jobs: docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}" docker compose down sudo chown "${USER}:docker" ~/build/${{ matrix.exe }} - - name: Verify --update-to + - name: Verify --update-to in container env: EXE_NAME: ${{ matrix.exe }} CHANNEL: ${{ inputs.channel }} diff --git a/bundle/docker/linux/entrypoint.sh b/bundle/docker/linux/entrypoint.sh index e7a6a2e5b..e6e8710f8 100755 --- a/bundle/docker/linux/entrypoint.sh +++ b/bundle/docker/linux/entrypoint.sh @@ -32,5 +32,7 @@ if [[ -z "${SKIP_ONEDIR_BUILD:-}" ]]; then popd fi -runpy -m bundle.pyinstaller -mv "./dist/${EXE_NAME}" /build/ +if [[ -z "${SKIP_ONEFILE_BUILD:-}" ]]; then + runpy -m bundle.pyinstaller + mv "./dist/${EXE_NAME}" /build/ +fi diff --git a/bundle/docker/linux/verify.sh b/bundle/docker/linux/verify.sh index 11d0439da..1cb051ecf 100755 --- a/bundle/docker/linux/verify.sh +++ b/bundle/docker/linux/verify.sh @@ -1,10 +1,11 @@ #!/bin/sh -set -exuo +set -eu chmod +x /build/${EXE_NAME} if [ -z "${EXCLUDE_CURL_CFFI:-}" ]; then - /build/${EXE_NAME} -v --print-traffic -o- --impersonate chrome "https://tls.browserleaks.com/json" | cat + /build/${EXE_NAME} -v --print-traffic --impersonate chrome "https://tls.browserleaks.com/json" -o ./resp.json + cat ./resp.json fi if [ -n "${SKIP_UPDATE_TO:-}" ]; then