Merge "Resolve bashate violation E005"

playbooks/roles/os_neutron/templates/plugins/plumgrid/pgrc

@@ -1,5 +1,5 @@
-# {{ ansible_managed }}
 #!/bin/sh
+# {{ ansible_managed }}
 export os_auth_url="{{ keystone_service_adminuri }}/v3"
 export os_admin_user="{{ keystone_admin_user_name }}"
 export os_admin_tenant="{{ keystone_admin_tenant_name }}"

tox.ini

@@ -55,17 +55,12 @@ commands =
   # Run bashate check for all bash scripts
   # Ignores the following rules:
   #     E003: Indent not multiple of 4 (we prefer to use multiples of 2)
-  #     E005: File does not begin with #! or have .sh prefix
   #     E006: Line longer than 79 columns
-  bash -c "grep -Irl \
-    -e '!/usr/bin/env bash' \
-    -e '!/bin/bash' \
-    -e '!/bin/sh' \
-    --exclude-dir '.*' \
-    --exclude-dir '*.egg' \
-    --exclude-dir '*.egg-info' \
-    --exclude 'tox.ini' \
-    {toxinidir} | xargs bashate --verbose --ignore=E003,E005,E006"
+  bash -c "grep --recursive --binary-files=without-match \
+    --files-with-match '^.!.*\(ba\)\?sh$' \
+    --exclude-dir .tox \
+    --exclude-dir .git \
+    {toxinidir} | xargs bashate --error . --verbose --ignore=E003,E006"
 
 [testenv:ansible-lint]
 deps =