Skip to content

Commit ca83ed2

Browse files
make tool_installer executable
1 parent 4c9cb1e commit ca83ed2

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

.devcontainer/post_create_command.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ npm install -g @devcontainers/cli
1818
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
1919
REPOSITORY_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd -P)"
2020

21-
sudo python3 "${REPOSITORY_ROOT}/tools/tool_installer.py" install shellcheck yamlfmt
21+
sudo "${REPOSITORY_ROOT}/tools/tool_installer.py" install shellcheck yamlfmt
2222

2323
pre-commit install
2424

src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ apt-get update
4040
apt-get install apt-transport-https -y
4141

4242
# Lockfile-managed Bazel tooling
43-
python3 /usr/local/share/score-tools/tool_installer.py install bazelisk buildifier starpls
43+
/usr/local/share/score-tools/tool_installer.py install bazelisk buildifier starpls
4444

4545
# Bazelisk + Bazel
4646
ln -sf /usr/local/bin/bazelisk /usr/local/bin/bazel

src/s-core-devcontainer/.devcontainer/bazel-feature/tests/test_default.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ set -euo pipefail
1818
# Read tool versions + metadata into environment variables
1919
. /usr/local/share/score-tools/versions.sh /devcontainer/features/bazel/versions.yaml
2020

21-
bazelisk_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version bazelisk)"
22-
buildifier_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version buildifier)"
23-
starpls_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version starpls)"
21+
bazelisk_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version bazelisk)"
22+
buildifier_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version buildifier)"
23+
starpls_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version starpls)"
2424
# Bazel-related tools
2525
## This is the bazel version preinstalled in the devcontainer.
2626
## A solid test would disable the network interface first to prevent a different version from being downloaded,

src/s-core-devcontainer/.devcontainer/s-core-local/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ apt-get install -y "python${python_version}" python3-pip python3-venv
5858
apt-get install -y flake8 python3-autopep8 black python3-yapf mypy pydocstyle pycodestyle bandit pipenv virtualenv pylint
5959

6060
# Lockfile-managed local developer tools
61-
python3 /usr/local/share/score-tools/tool_installer.py install shellcheck ruff actionlint yamlfmt uv uvx
61+
/usr/local/share/score-tools/tool_installer.py install shellcheck ruff actionlint yamlfmt uv uvx
6262

6363
# GraphViz
6464
# The Ubuntu Noble package of GraphViz

src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ KERNEL=$(uname -s)
2121
# Read tool versions + metadata into environment variables
2222
. /usr/local/share/score-tools/versions.sh /devcontainer/features/s-core-local/versions.yaml
2323

24-
shellcheck_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version shellcheck)"
25-
ruff_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version ruff)"
26-
actionlint_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version actionlint)"
27-
yamlfmt_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version yamlfmt)"
28-
uv_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version uv)"
29-
uvx_lockfile_version="$(python3 /usr/local/share/score-tools/tool_installer.py version uvx)"
24+
shellcheck_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version shellcheck)"
25+
ruff_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version ruff)"
26+
actionlint_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version actionlint)"
27+
yamlfmt_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version yamlfmt)"
28+
uv_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version uv)"
29+
uvx_lockfile_version="$(/usr/local/share/score-tools/tool_installer.py version uvx)"
3030

3131
# pre-commit, it is available via $PATH in login shells, but not in non-login shells
3232
check "validate pre-commit is working and has the correct version" bash -c "pre-commit --version | grep '4.5.1'"

tools/tool_installer.py

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env python3
12
# *******************************************************************************
23
# Copyright (c) 2026 Contributors to the Eclipse Foundation
34
#
@@ -16,8 +17,8 @@
1617
without extra packages.
1718
1819
Usage:
19-
python3 tool_installer.py install shellcheck yamlfmt
20-
python3 tool_installer.py version shellcheck
20+
tool_installer.py install shellcheck yamlfmt
21+
tool_installer.py version shellcheck
2122
"""
2223

2324
# pyright: reportAny=false, reportUnusedCallResult=false, reportExplicitAny=false

0 commit comments

Comments
 (0)