trivial: install shellcheck from dependencies.xml

This commit is contained in:
Mario Limonciello 2021-04-09 10:44:35 -05:00
parent c6bbe4507a
commit d0c6c4b323
2 changed files with 9 additions and 4 deletions

View File

@ -1097,7 +1097,7 @@
<distro id="ubuntu">
<package variant="x86_64" />
</distro>
</dependency>
</dependency>
<dependency type="build" id="python3-requests">
<distro id="fedora">
<package />
@ -1380,4 +1380,12 @@
<package />
</distro>
</dependency>
<dependency type="build" id="shellcheck">
<distro id="ubuntu">
<package variant="x86_64" />
</distro>
<distro id="fedora">
<package>ShellCheck</package>
</distro>
</dependency>
</dependencies>

View File

@ -17,9 +17,6 @@ if [ -n "$PS1" ] || [[ $- == *i* ]] || [ -f /dev/.cros_milestone ]; then
read -p "Install build dependencies? (y/n) " question
if [ "$question" = "y" ]; then
DEPS=$(./contrib/ci/generate_dependencies.py)
if ! which shellcheck >/dev/null 2>&1; then
DEPS="$DEPS shellcheck"
fi
OS=$(python3 -c "import distro; print(distro.linux_distribution()[0].split()[0].lower())")
if [ "$OS" = "debian" ] || [ "$OS" = "ubuntu" ]; then
if ! python3 -c "import venv"; then