Merge branch 'bash-sh-syntax' into 'master'

Check both bash and sh script syntax

See merge request tecnalia_robotics-public/gitlab_templates!4

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -37,12 +37,16 @@ python_syntax:
   when: always
 
 ##########################################################
-## Check for errors in bash scripts
+## Check for errors in bash/sh scripts
 ## Uses https://github.com/cytopia/awesome-ci
 ##########################################################
 bash_syntax:
   stage: postcheck
-  script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-sh --path=/ac --extension=sh --ignore=.ci_config
+  script:
+    - RET=0
+    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-sh --path=/ac --extension=sh --ignore=.ci_config || RET=1
+    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-bash --path=/ac --extension=bash --ignore=.ci_config || RET=1
+    - exit $RET
   allow_failure: yes
   when: always