From 4b7f6b3ead01c6b300f72381eae294946aca30d3 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Thu, 19 Nov 2020 19:51:41 -0800 Subject: [PATCH] all current tests pass --- .sig/manifest.8E47A1EC35A1551D.asc | 26 +++++++++++++------------- .sig/manifest.txt | 4 ++-- Makefile | 1 + sig | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.sig/manifest.8E47A1EC35A1551D.asc b/.sig/manifest.8E47A1EC35A1551D.asc index 4fae443..e4c7270 100644 --- a/.sig/manifest.8E47A1EC35A1551D.asc +++ b/.sig/manifest.8E47A1EC35A1551D.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAl+25jgACgkQjkeh7DWh -VR2qOA//fFUsl8qE3L5+5VpUX2eIJ9+fdzo+4cSgRojwZOWt4QbjfcWYGRIotyqF -QkX2nyU1vesApQfDSDsvnC7qZq2Rm/0CXYr3+QXZ1tMT030oQYLkxG+gNQjVYqWU -o3jPkGjZg7u8DzGngp33wgsJ6l5bP16HbIxAdslAwtccq2daq8pU9w238H8dBcyx -WWzW7PrYae/LKAu7lMKpTEohmQ9RbXqPDoGaMks+FqZaOZvRhvTyiYFkyTMasVQM -7gf9P5mOMyGX7GvCzkdkEUUuT1T9IcJNa2vDZP5Thyr+t+W5ABWy+uvS1G5YDBGX -GAPAUQ2a9CpuOGwSsxlrwiXcXuPly2FqspIewAwB/jCyRcrpUHEAK4a/WiNyjl0X -oBRskNSVKFm7K33eDQC7yMOYHraIsu8/swuaE+7joitmhQGlxXq6+fQ53sF6N8L6 -YOQH5sHvrf9RO+sDsctYEBzBCUV2MZgdoVRyOhOLyeyqMUsQ1rnCPQeqU6GCHd9m -yrmECNaZ7fKhh37mihmBNjJzsefkXHWFgaDRIOe8MqOxQNFWjFUYl/hF4ek9bd3b -2j6LfZ/OwrJvtywYgxPvaBc/uWG8X+2TBgxXG0tvbybIHMa9nnFQoV2ykuF7ET+Z -4YHJkppqy7pAPwzuNkPI4/GZavABCqWzCaty5ZVMnoUpnd6nGec= -=/hRR +iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAl+3PS0ACgkQjkeh7DWh +VR0WVg/+N03hml7HngM0DbJBhKuSrEzjOIe+Bzx96VVqo322oDtHielnHD9bSbJj +HhKhjaLZeYVDaRWwloMtypF0JEWgbuwKmWp8tqqoOM4ySkgvkpphIaaQUvU56eTW +8daPwOC1d/A/SuSuAK7Do0S7XOuTY5uMyu/ALxXO5kV/tMmfAufcN1j+3FL48Dk3 +iHHZnVKTBN2zH3hEsuwpVIpSUVZcxNumjYegyuGYkesKVCvd4xhdqMSJXhC+XAeQ +uHtO8Uh6S854gmrPwCBcicq35HAhaMBJJ9Rb3ubigQMjFpXnylThDo4gdgSBZyXE +VsBTmQS665v9k2OfJgtKhljiWfwCpGv1pLk35bkDcJqSRbZc5kNZRuxL0GRWHPdM +XK42dJOq9IdrW+RCVB9cUTXURhs6YC529iFnPcmSqW2Iv0sbSBhIbrYO/PuVuAcX +9ZlV2DHRlhnDEJNRW1vp5GANBW99WiC1IcC1hRTa+5Ak06AdJsTGe2X0AxVq+ZNF +C6Ix/oJuQyb6oaSbpaBc6YmjAkvaTItyx4WlLck7KgQUttlEzUPuS3XTqfeeHuO6 +e/YqAqypVIQt20AH72zC0aCH+/v7tENIKNd3am2zYxW7jNANLqtX+h5Zud6abK3G +iBPjJp+BPrXsqzsd7hRUSoZeeSM7VQNVqQMI+q7E4hKzyvplXL4= +=SKg/ -----END PGP SIGNATURE----- diff --git a/.sig/manifest.txt b/.sig/manifest.txt index 54fb9aa..9a0a8a5 100644 --- a/.sig/manifest.txt +++ b/.sig/manifest.txt @@ -1,8 +1,8 @@ 64263feac7b00952e9ec3b6c1fd11316faa58ff673c6bd085fac9f6f8d8389f6 .gitignore 66a3b8bfb76f689fc4ab7bd95907b29c17c704c075c00c6cc6382e424dccd6bb .gitlab-ci.yml -d26196a972cda50b2ce735fcce3f64fa2634f85822a18f07cd7ab42aa24bec0e Makefile +373cb178010e75bdccd5c792c43429c8274a615c8b69b5d57f4c2ec0263f802b Makefile f19d267e4aa6bf82d5416891697a2a81a574efdddecf5c54e3a8a77c207013fa README.md -b8fe3398ecd3992d190fa5f0c475a8ae424c4500407cd5b8e568b048d4844b3f sig +eb12fb7ea33eafb138fa89020d6bfeb57595e0ffa30634aca764fd34417853d2 sig 655df07f3827e7055d0c6aa21a0a4907957a34a2b8a1e9131225c537e448e2e3 test/Dockerfile 55250be3c8f25dcbe68a73e8de8c8a94d8ceb0354c7f955519373d9c963903dd test/test.bats c95e072f0917531257c069516fc1bf08fd98e5c5f3958f5353a219cb5b70fd38 test/test_helper.bash diff --git a/Makefile b/Makefile index eec7d7e..2f87fed 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ test-image: test-shell: test-image docker run \ --rm \ + --tty \ --interactive \ --volume $(PWD)/:/home/test/sig \ local/sig-test \ diff --git a/sig b/sig index e35962b..5e3fcfd 100755 --- a/sig +++ b/sig @@ -112,7 +112,7 @@ check_tools(){ ### Get files that will be added to the manifest for signing ### Use git if available, else fall back to find get_files(){ - if command -v git >/dev/null; then + if [ -d '.git' ] && command -v git >/dev/null; then git ls-files | grep -v ".${PROGRAM}" else find . \