Merge branch 'add-shellcheck-to-install-essentials' into 'master'

Add shellcheck to install-essentials

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/794

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Balasankar 'Balu' C 2024-04-09 11:21:31 +00:00
commit 646e283f0d

View file

@ -6,28 +6,16 @@ IFS=$'\n\t'
# We install `git-core` as some tooling expect `/usr/bin/git`
# other tools that rely on PATH ordering will pick a one in `/usr/local`
# if present
function install_debian_bullseye_deps() {
function install_debian_deps() {
apt-get install -y \
curl wget build-essential apt-utils clang locales openssh-client \
libclang-dev libssl-dev libyaml-dev libreadline-dev llvm-dev zlib1g-dev \
libncurses5-dev libffi-dev ca-certificates libxml2-dev \
libxslt1-dev libcurl4-openssl-dev libicu-dev \
logrotate python3-docutils pkg-config cmake \
libkrb5-dev postgresql-client unzip \
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
libre2-dev libevent-dev gettext rsync git-core lsb-release
}
function install_debian_bookworm_deps() {
apt-get install -y \
curl wget build-essential apt-utils clang locales openssh-client \
libclang-dev libssl-dev libyaml-dev libreadline-dev llvm-dev zlib1g-dev \
libncurses5-dev libffi-dev ca-certificates libxml2-dev \
libxslt1-dev libcurl4-openssl-dev libicu-dev \
logrotate python3-docutils pkg-config cmake \
libkrb5-dev postgresql-client unzip \
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
libre2-dev libevent-dev gettext rsync git-core lsb-release
apt-utils build-essential ca-certificates clang cmake curl \
gettext git-core libclang-dev libcurl4-openssl-dev libevent-dev \
libffi-dev libicu-dev libjpeg-dev libkrb5-dev libncurses5-dev \
libpng-dev libpq-dev libre2-dev libreadline-dev libsqlite3-dev \
libssl-dev libxml2-dev libxslt1-dev libyaml-dev libzstd-dev \
llvm-dev locales logrotate lsb-release openssh-client pkg-config \
postgresql-client python3-docutils rsync shellcheck unzip wget \
zlib1g-dev
}
function prepare_debian_environment() {
@ -38,10 +26,8 @@ function prepare_debian_environment() {
VERSION=`cat /etc/issue | cut -d ' ' -f 3`
case "$VERSION" in
11)
install_debian_bullseye_deps;;
12)
install_debian_bookworm_deps;;
11|12)
install_debian_deps;;
esac
# Set UTF-8