diff options
| author | Dennis Camera <cdist@dtnr.ch> | 2021-04-06 18:58:58 +0200 |
|---|---|---|
| committer | Dennis Camera <cdist@dtnr.ch> | 2021-04-06 18:58:58 +0200 |
| commit | debf7cdbd2b59ffbd1dde67be1fea03dafa8fa6f (patch) | |
| tree | 67ef1561c3115766d22d1fbc7ed728f8c1cdbdd5 | |
| parent | a70cbb2693ebd0b6ac5fc3da7d15b558d8bffd15 (diff) | |
| download | __dtnrch_getssl-debf7cdbd2b59ffbd1dde67be1fea03dafa8fa6f.tar.gz __dtnrch_getssl-debf7cdbd2b59ffbd1dde67be1fea03dafa8fa6f.zip | |
[type/__dtnrch_getssl] Allow to specify gitrefs in cksums.txt as a fix for releases without tag
| -rw-r--r-- | type/__dtnrch_getssl/files/cksums.txt | 6 | ||||
| -rwxr-xr-x | type/__dtnrch_getssl/manifest | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/type/__dtnrch_getssl/files/cksums.txt b/type/__dtnrch_getssl/files/cksums.txt index 43fcad9..e06ac9a 100644 --- a/type/__dtnrch_getssl/files/cksums.txt +++ b/type/__dtnrch_getssl/files/cksums.txt @@ -1,4 +1,4 @@ -# tag sha256sum cksum #octets +# vers@gitref sha256sum cksum #octets v1.0 342738cd6e31075faaf90bbfc5f4b28270a2e71ececd62011afcd4503b23b194 1298128142 43300 v1.84 efaa0258ce7b1ce98143b90222d7bcff946f63ab20f0990e4ce1af0ae55be5fe 4246272524 73968 v1.85 235edecabff3d872f8a01b6fa8e4012d59b360c4c8b0a1439f13e0582d922f45 1006972390 74270 @@ -23,10 +23,10 @@ v2.24 df1ffdcfa8034a422d5289c959f185638a1907d2b9eefc771196416d182b6ac9 242033502 v2.26 d04b597e97506a9145a3c5c4f24502a2f9deff601adaf2df344c49d68f218b6e 224152343 108785 v2.27 140615fca20e66a985db9e34b517cfb644713eb35e131e250a157ab55a4fd842 2343364619 109164 v2.28 61833590bcf7948f1df29c5bbf19c4ea000c81cabc9aeb82a5192ca4dc594139 1175685050 110776 -2.29 140af06cea87f0e1932115753d029a41602886cdc8238c3c37875bd6c3855e74 3835215315 110967 +v2.29@2.29 140af06cea87f0e1932115753d029a41602886cdc8238c3c37875bd6c3855e74 3835215315 110967 v2.30 b17134a41c92c89ee645ccafcd54a1752cfdaa7e01b1ffed0c14bc6d6a4bbd42 673895873 112739 v2.31 3bd2216ca6080690151ff1a5688416cc714b4a5815a4bb4e28f8d8cead83a815 3219258588 117106 v2.32 8faf6caca9771d072b98364af6cad9eab7fdf7604eca22da4ef88da338f8caba 3856212121 118318 v2.33 a70cf78e830ef8bf8db4cb5ffebb81cd45810bcaee2b690a5a17eff5f2eb8041 2610311015 118387 v2.34 a36a7fde26c3b33239a8569fc457d964b4d5d711945d5cdedaf233cb2730b182 305285124 120733 -cdea0e314b5254366b4e08c9be23a3f92dff6ae2 9e464afec7e8ad26e1972f8c3ca065562da14dbe610b7c7ae202a5e0068bd4f9 4024741063 126153 +v3.35@cdea0e314b5254366b4e08c9be23a3f92dff6ae2 9e464afec7e8ad26e1972f8c3ca065562da14dbe610b7c7ae202a5e0068bd4f9 4024741063 126153 diff --git a/type/__dtnrch_getssl/manifest b/type/__dtnrch_getssl/manifest index a499a36..ce873a6 100755 --- a/type/__dtnrch_getssl/manifest +++ b/type/__dtnrch_getssl/manifest @@ -62,7 +62,7 @@ in esac # shellcheck disable=SC2034 -IFS=' ' read -r tag_name sha256_should cksum_should <<EOF +IFS=' ' read -r gitref sha256_should cksum_should <<EOF $( version_should=$(cat "${__object:?}/parameter/version") case ${version_should} @@ -71,7 +71,7 @@ $( tail -n 1 "${__type:?}/files/cksums.txt" ;; (*) - awk -F '\t' -v vers="${version_should}" 'index($1, vers) == ($1 ~ /^v/) + 1' "${__type:?}/files/cksums.txt" + awk -F '\t' -v vers="${version_should}" 'BEGIN { if (vers !~ /^v/) vers = "v" vers } $1 == vers' "${__type:?}/files/cksums.txt" ;; esac ) @@ -80,7 +80,7 @@ EOF require="${require-}${require:+ }$(test "${state_should}" != 'absent' || echo __cron/getssl)" \ __staged_file "${DEST}/getssl" --state "${state_should}" \ --owner 0 --mode 0755 \ - --source "https://raw.githubusercontent.com/srvrco/getssl/${tag_name}/getssl" \ + --source "https://raw.githubusercontent.com/srvrco/getssl/${gitref#*@}/getssl" \ --cksum "${cksum_should}" if test "${state_should}" != 'absent' |