From 7ad3acc8faa151e307c82b659f884205ef47012b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 27 Jan 2021 17:04:13 +0100
Subject: Merging upstream version 2.9.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 testing/resources/exclude_types_repo/bin/hook.sh               | 2 +-
 testing/resources/failing_hook_repo/bin/hook.sh                | 2 +-
 testing/resources/modified_file_returns_zero_repo/bin/hook2.sh | 2 +-
 testing/resources/script_hooks_repo/bin/hook.sh                | 2 +-
 testing/resources/types_or_repo/.pre-commit-hooks.yaml         | 6 ++++++
 testing/resources/types_or_repo/bin/hook.sh                    | 3 +++
 testing/resources/types_repo/bin/hook.sh                       | 2 +-
 testing/zipapp/make                                            | 3 +++
 8 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 testing/resources/types_or_repo/.pre-commit-hooks.yaml
 create mode 100755 testing/resources/types_or_repo/bin/hook.sh

(limited to 'testing')

diff --git a/testing/resources/exclude_types_repo/bin/hook.sh b/testing/resources/exclude_types_repo/bin/hook.sh
index bdade51..a828db4 100755
--- a/testing/resources/exclude_types_repo/bin/hook.sh
+++ b/testing/resources/exclude_types_repo/bin/hook.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-echo $@
+echo "$@"
 exit 1
diff --git a/testing/resources/failing_hook_repo/bin/hook.sh b/testing/resources/failing_hook_repo/bin/hook.sh
index 229ccaf..7dcffeb 100755
--- a/testing/resources/failing_hook_repo/bin/hook.sh
+++ b/testing/resources/failing_hook_repo/bin/hook.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 echo 'Fail'
-echo $@
+echo "$@"
 exit 1
diff --git a/testing/resources/modified_file_returns_zero_repo/bin/hook2.sh b/testing/resources/modified_file_returns_zero_repo/bin/hook2.sh
index 5af177a..a9f1dcd 100755
--- a/testing/resources/modified_file_returns_zero_repo/bin/hook2.sh
+++ b/testing/resources/modified_file_returns_zero_repo/bin/hook2.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo $@
+echo "$@"
diff --git a/testing/resources/script_hooks_repo/bin/hook.sh b/testing/resources/script_hooks_repo/bin/hook.sh
index 6565ee4..cbc4b35 100755
--- a/testing/resources/script_hooks_repo/bin/hook.sh
+++ b/testing/resources/script_hooks_repo/bin/hook.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-echo $@
+echo "$@"
 echo 'Hello World'
diff --git a/testing/resources/types_or_repo/.pre-commit-hooks.yaml b/testing/resources/types_or_repo/.pre-commit-hooks.yaml
new file mode 100644
index 0000000..a4ea920
--- /dev/null
+++ b/testing/resources/types_or_repo/.pre-commit-hooks.yaml
@@ -0,0 +1,6 @@
+-   id: python-cython-files
+    name: Python and Cython files
+    entry: bin/hook.sh
+    language: script
+    types: [file]
+    types_or: [python, cython]
diff --git a/testing/resources/types_or_repo/bin/hook.sh b/testing/resources/types_or_repo/bin/hook.sh
new file mode 100755
index 0000000..a828db4
--- /dev/null
+++ b/testing/resources/types_or_repo/bin/hook.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+echo "$@"
+exit 1
diff --git a/testing/resources/types_repo/bin/hook.sh b/testing/resources/types_repo/bin/hook.sh
index bdade51..a828db4 100755
--- a/testing/resources/types_repo/bin/hook.sh
+++ b/testing/resources/types_repo/bin/hook.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-echo $@
+echo "$@"
 exit 1
diff --git a/testing/zipapp/make b/testing/zipapp/make
index a644946..8740b2f 100755
--- a/testing/zipapp/make
+++ b/testing/zipapp/make
@@ -99,6 +99,9 @@ def main() -> int:
         shebang = '/usr/bin/env python3'
         zipapp.create_archive(tmpdir, filename, interpreter=shebang)
 
+    with open(f'{filename}.sha256sum', 'w') as f:
+        subprocess.check_call(('sha256sum', filename), stdout=f)
+
     return 0
 
 
-- 
cgit v1.2.3