bootstrap: Install ShellCheck and shfmt

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ce30e044335515270d2ad5661675b6302c269502..a14d8e66fc700a7d7e77132fdc96e56f2b267547 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: b62662cd85b10ca4767b9ead4e9b0482ad98ddb2
+  SAMBA_CI_CONTAINER_TAG: 1e06877f1afbb3dbd4283e00310d63216a274333
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index a00b253ae777505e93971e1fcc217963cbfd9344..bf2ce5207bb29c04ba3c552e9f6b4ad2cdd7509f 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -133,6 +133,8 @@ PKGS = [
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
     ('', 'mold'),
+    ('', 'ShellCheck'),
+    ('', 'shfmt'),
 
     ('python3', 'python3'),
     ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
@@ -472,6 +474,8 @@ RPM_DISTS = {
             'python3-setproctitle': 'python36-setproctitle',
             'tracker-devel': '', # do not install
             'mold': '',
+            'ShellCheck': '',
+            'shfmt': '',
         }
     },
     'centos8s': {
@@ -487,6 +491,8 @@ RPM_DISTS = {
             'perl-FindBin': '',
             'liburing-devel': '', # not available yet, Add me back, once available!
             'mold': '',
+            'ShellCheck': '',
+            'shfmt': '',
         }
     },
     'fedora36': {
@@ -540,6 +546,8 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mold': '',
+            'ShellCheck': '',
+            'shfmt': '',
         }
     }
 }

diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f36mit120/bootstrap.sh
index c2bbdb18908006ef9aae7ac8e85d6aa81fa33051..c46dcf0d705189cc9f2a0476890365958c50ba68 100755 (executable)
--- a/bootstrap/generated-dists/f36mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f36mit120/bootstrap.sh
@@ -15,6 +15,7 @@ dnf update -y
 dnf install -y \
     --setopt=install_weak_deps=False \
     @development-tools \
+    ShellCheck \
     acl \
     attr \
     autoconf \
@@ -109,6 +110,7 @@ dnf install -y \
     rpcsvc-proto-devel \
     rsync \
     sed \
+    shfmt \
     sudo \
     systemd-devel \
     tar \

diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
index 646a282178ad0f7676920d3a3fc192ba5ad93bc3..d1e9af5af3de02f2756279eba11fc8c13073559f 100644 (file)
--- a/bootstrap/generated-dists/f36mit120/packages.yml
+++ b/bootstrap/generated-dists/f36mit120/packages.yml
@@ -1,6 +1,7 @@
 ---
 packages:
   - @development-tools
+  - ShellCheck
   - acl
   - attr
   - autoconf
@@ -95,6 +96,7 @@ packages:
   - rpcsvc-proto-devel
   - rsync
   - sed
+  - shfmt
   - sudo
   - systemd-devel
   - tar

diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora36/bootstrap.sh
index 32379e343319803f7cf7ffcdb368ca4cb4152159..6cbde6f341175a5ed962922def2037dec2b06427 100755 (executable)
--- a/bootstrap/generated-dists/fedora36/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora36/bootstrap.sh
@@ -12,6 +12,7 @@ dnf update -y
 dnf install -y \
     --setopt=install_weak_deps=False \
     @development-tools \
+    ShellCheck \
     acl \
     attr \
     autoconf \
@@ -106,6 +107,7 @@ dnf install -y \
     rpcsvc-proto-devel \
     rsync \
     sed \
+    shfmt \
     sudo \
     systemd-devel \
     tar \

diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
index 646a282178ad0f7676920d3a3fc192ba5ad93bc3..d1e9af5af3de02f2756279eba11fc8c13073559f 100644 (file)
--- a/bootstrap/generated-dists/fedora36/packages.yml
+++ b/bootstrap/generated-dists/fedora36/packages.yml
@@ -1,6 +1,7 @@
 ---
 packages:
   - @development-tools
+  - ShellCheck
   - acl
   - attr
   - autoconf
@@ -95,6 +96,7 @@ packages:
   - rpcsvc-proto-devel
   - rsync
   - sed
+  - shfmt
   - sudo
   - systemd-devel
   - tar

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index d9766fd37b911a6ad95e6afc4d1504dcdb89c0ab..0830eea5f84fa2662d8ed8a50e2e5bd8786ff1de 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-b62662cd85b10ca4767b9ead4e9b0482ad98ddb2
+1e06877f1afbb3dbd4283e00310d63216a274333