File tree Expand file tree Collapse file tree
src/s-core-devcontainer/.devcontainer/s-core-local Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ PRE_COMMIT_CONFIG_FILE=".pre-commit-config.yaml"
1919if [[ -f " ${PRE_COMMIT_CONFIG_FILE} " ]]
2020then
2121 echo " Pre-commit configuration found (${PRE_COMMIT_CONFIG_FILE} )"
22- " ${PIPX_BIN_DIR} / pre-commit" install
22+ pre-commit install
2323else
2424 echo " No pre-commit configuration found (${PRE_COMMIT_CONFIG_FILE} )"
2525 echo " Skipping pre-commit hook's installation"
Original file line number Diff line number Diff line change @@ -84,6 +84,11 @@ download_and_extract_from_github() {
8484 rm " ${temp_file} "
8585}
8686
87+ # always add PIPX_BIN_DIR to path
88+ PIPX_BIN_DIR_EXPORT=" $( grep " export PIPX_BIN_DIR" /etc/bash.bashrc) "
89+ eval " ${PIPX_BIN_DIR_EXPORT} "
90+ echo -e " PATH=\" ${PIPX_BIN_DIR} :\$ PATH\" \nexport PATH" >> /etc/profile.d/pipx_bin_dir.sh
91+
8792apt-get update
8893
8994# Unminimize the image to include standard packages like man pages
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ KERNEL=$(uname -s)
2323. /devcontainer/features/s-core-local/versions.sh /devcontainer/features/s-core-local/versions.yaml
2424
2525# pre-commit, it is available via $PATH in login shells, but not in non-login shells
26- check " validate pre-commit is working and has the correct version" bash -c " ${PIPX_BIN_DIR} / pre-commit --version | grep '4.5.1'"
26+ check " validate pre-commit is working and has the correct version" bash -c " pre-commit --version | grep '4.5.1'"
2727
2828# Common tooling
2929check " validate shellcheck is working and has the correct version" bash -c " shellcheck --version | grep '${shellcheck_version} '"
@@ -75,6 +75,7 @@ check "validate gh is working and has the correct version" bash -c "gh --version
7575check " validate valgrind is working and has the correct version" bash -c " valgrind --version | grep '${valgrind_version} '"
7676if [ " ${ARCHITECTURE} " = " amd64" ] || { [ " ${ARCHITECTURE} " = " arm64" ] && [ " ${KERNEL} " = " Darwin" ]; }; then
7777 check " validate codeql is working and has the correct version" bash -c " codeql --version | grep '${codeql_version} '"
78+ check " validate CODEQL_HOME is set correctly" bash -c " echo ${CODEQL_HOME} | grep \" /usr/local/codeql\" "
7879fi
7980
8081# Qemu target-related tools
You can’t perform that action at this time.
0 commit comments