You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tv...@apache.org on 2022/02/09 03:01:42 UTC

[beam] branch tvalentyn-patch-1 created (now 310c53a)

This is an automated email from the ASF dual-hosted git repository.

tvalentyn pushed a change to branch tvalentyn-patch-1
in repository https://gitbox.apache.org/repos/asf/beam.git.


      at 310c53a  Update license_script.sh

This branch includes the following new commits:

     new 310c53a  Update license_script.sh

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[beam] 01/01: Update license_script.sh

Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tvalentyn pushed a commit to branch tvalentyn-patch-1
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 310c53aa8da45fa54bf32055a4ef37160590cc95
Author: tvalentyn <tv...@users.noreply.github.com>
AuthorDate: Tue Feb 8 19:00:25 2022 -0800

    Update license_script.sh
---
 sdks/java/container/license_scripts/license_script.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdks/java/container/license_scripts/license_script.sh b/sdks/java/container/license_scripts/license_script.sh
index c2a6540..979a74a 100755
--- a/sdks/java/container/license_scripts/license_script.sh
+++ b/sdks/java/container/license_scripts/license_script.sh
@@ -40,7 +40,7 @@ if [ -d "$DOWNLOAD_DIR" ]; then rm -rf "$DOWNLOAD_DIR" ; fi
 mkdir -p "$DOWNLOAD_DIR"
 cp -r "${EXISTING_LICENSE_DIR}"/*.jar "${DOWNLOAD_DIR}"
 
-$PYTHON -m venv ${ENV_DIR} && . ${ENV_DIR}/bin/activate
+$PYTHON -m venv --clear ${ENV_DIR} && . ${ENV_DIR}/bin/activate
 pip install --retries 10 --upgrade pip setuptools wheel
 
 # install packages
@@ -52,8 +52,8 @@ FLAGS="--license_index=${INDEX_FILE} \
        --dep_url_yaml=${SCRIPT_DIR}/dep_urls_java.yaml \
        --manual_license_path=${SCRIPT_DIR}/manual_licenses"
 
-echo "Executing ${ENV_DIR}/bin/python ${SCRIPT_DIR}/pull_licenses_java.py $FLAGS"
-"${ENV_DIR}/bin/python" "${SCRIPT_DIR}/pull_licenses_java.py" $FLAGS
+echo "Executing python ${SCRIPT_DIR}/pull_licenses_java.py $FLAGS"
+python "${SCRIPT_DIR}/pull_licenses_java.py" $FLAGS
 
 # If this script is running, it is assumed that outputs are out of date and should be cleared and rewritten
 if [ -d "$DEST_DIR" ]; then rm -rf "$DEST_DIR"; fi