From d69d84cb1e2fdfe7805a7b60e13a9044abf59e18 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 26 May 2023 11:32:08 -0700 Subject: [PATCH] Update python scripts in the debpkg build to use python3 This will unblock dotnet/runtime#86803 --- .../build/deb-package-tool/package_tool.sh | 6 +++--- .../deb-package-tool/scripts/config_template_generator.py | 2 +- .../build/deb-package-tool/scripts/extract_json_value.py | 2 +- .../build/deb-package-tool/scripts/manpage_generator.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh index 6987c8a0b1d..87414074d52 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh @@ -119,7 +119,7 @@ validate_inputs(){ } parse_config_and_set_env_vars(){ - extract_base_cmd="python $SCRIPT_DIR/scripts/extract_json_value.py" + extract_base_cmd="python3 $SCRIPT_DIR/scripts/extract_json_value.py" # Arguments Take Precedence over Config [ -z "$PACKAGE_VERSION" ] && PACKAGE_VERSION="$($extract_base_cmd $CONFIG "release.package_version")" @@ -218,7 +218,7 @@ package_install_scripts(){ ## Generation Functions ## generate_config_templates(){ - python ${SCRIPT_DIR}/scripts/config_template_generator.py $CONFIG $SCRIPT_DIR/templates/debian $DEBIAN_DIR $PACKAGE_NAME $PACKAGE_VERSION + python3 ${SCRIPT_DIR}/scripts/config_template_generator.py $CONFIG $SCRIPT_DIR/templates/debian $DEBIAN_DIR $PACKAGE_NAME $PACKAGE_VERSION } generate_manpages(){ @@ -226,7 +226,7 @@ generate_manpages(){ mkdir -p $DOCS_DIR # Generate the manpages from json spec - python ${SCRIPT_DIR}/scripts/manpage_generator.py ${DOCS_JSON_PATH} ${DOCS_DIR} + python3 ${SCRIPT_DIR}/scripts/manpage_generator.py ${DOCS_JSON_PATH} ${DOCS_DIR} fi } diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py index a279bcb561a..4699e1c5c18 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py index 7eca648b978..28cb9b380dc 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py index 2aa3a712fa9..9ead4c8d8c6 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license.