aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguillaume.lambert <guillaume.lambert@orange.com>2021-12-10 21:17:30 +0100
committerguillaume.lambert <guillaume.lambert@orange.com>2021-12-12 00:23:51 +0100
commitd09f363e87c98d19ba2fccdf8f235d5cbfb908ee (patch)
tree80e489c14426ec693563b629aa1b1e5ac1e5b092
parentab85a0e0c722b248e77bc8d02c1647b3bd9154ff (diff)
[GLOBAL] Move checkbashisms to a dedicated script
Using a dedicated shell script rather than scripts commands directly in tox.ini configuration is usually recommanded. It avoids quoting hell issues and ensures a better virtualenv isolation. Issue-ID: OOM-2643 Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com> Co-authored-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ic4764f628d6f8c3bb4d0dd36a0559603c80f6c4a
-rwxr-xr-x.ci/check-bashisms.sh27
-rw-r--r--tox.ini13
2 files changed, 30 insertions, 10 deletions
diff --git a/.ci/check-bashisms.sh b/.ci/check-bashisms.sh
new file mode 100755
index 0000000000..0dae2255b7
--- /dev/null
+++ b/.ci/check-bashisms.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Copyright © 2021 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if ! which checkbashisms >/dev/null && ! sudo yum install devscripts-minimal && ! sudo apt-get install devscripts
+then
+ printf "checkbashisms command not found - please install it \n\
+ (e.g. sudo apt-get install devscripts | yum install devscripts-minimal )\n" >&2
+ exit 2
+fi
+find . -not -path '*/.*' -name '*.sh' -exec checkbashisms {} + || exit 3
+find . -not -path '*/.*' -name '*.failover' -exec checkbashisms -f \{\} + || exit 4
+! find . -not -path '*/.*' -name '*.sh' -exec grep 'local .*=' {} + || exit 5
+! find . -not -path '*/.*' -name '*.failover' -exec grep 'local .*=' {} + || exit 6
+exit 0
diff --git a/tox.ini b/tox.ini
index dee4f3accf..337b397a26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,17 +57,10 @@ commands =
[testenv:checkbashisms]
deps =
-whitelist_externals = sh
- find
- checkbashisms
+whitelist_externals =
+ {toxinidir}/.ci/check-bashisms.sh
commands =
- sh -c 'which checkbashisms>/dev/null || sudo yum install devscripts-minimal || sudo apt-get install devscripts \
- || (echo "checkbashisms command not found - please install it (e.g. sudo apt-get install devscripts | \
- yum install devscripts-minimal )" >&2 && exit 1)'
- find . -not -path '*/\.*' -name *.sh -exec checkbashisms \{\} +
- find . -not -path '*/\.*' -name *.failover -exec checkbashisms -f \{\} +
- sh -c "! find . -not -path '*/\.*' -name *.sh -exec grep 'local .*=' \{\} + || exit 2"
- sh -c "! find . -not -path '*/\.*' -name *.failover -exec grep 'local .*=' \{\} + || exit 2"
+ {toxinidir}/.ci/check-bashisms.sh
[testenv:autopep8]
deps =