diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/by-name/ta/tails-iso/files.json | 6 | ||||
| -rw-r--r-- | pkgs/by-name/ta/tails-iso/package.nix | 22 | ||||
| -rwxr-xr-x | pkgs/by-name/ta/tails-iso/update.sh | 16 |
3 files changed, 24 insertions, 20 deletions
diff --git a/pkgs/by-name/ta/tails-iso/files.json b/pkgs/by-name/ta/tails-iso/files.json index 717f850c..bc00b07a 100644 --- a/pkgs/by-name/ta/tails-iso/files.json +++ b/pkgs/by-name/ta/tails-iso/files.json @@ -1,7 +1,7 @@ { - "version": "7.9.1", + "version": "7.10", "files": { - "iso.sig": "sha256-vjlzcCy9oG2FhFsJIPeCG6HU1LPPgb3iEi4jCDl/jrk=", - "iso": "sha256-KvUzGVqMiUAXBglyiLM2kdvX/N0qVwPqcAxbONMAEJo=" + "iso.sig": "sha256-UDdZgDOrgcpQnWnnysmyy16CRQD2dzNvwauO/2ZpRz4=", + "iso": "sha256-basjshTPOlXXWpDf17GA57wmptqXv6FP/MAiON3NF0M=" } } diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix index 87bfd0b2..3acefd61 100644 --- a/pkgs/by-name/ta/tails-iso/package.nix +++ b/pkgs/by-name/ta/tails-iso/package.nix @@ -40,20 +40,16 @@ sequoia-sq ]; - buildPhase = - /* - bash - */ - '' - for src in $srcs; do - cp --recursive "$src" "$(stripHash "$src")" - done + buildPhase = '' + for src in $srcs; do + cp --recursive "$src" "$(stripHash "$src")" + done - sq verify \ - --signer-file=tails-signing.key \ - --signature-file=tails-${finalAttrs.version}.iso.sig \ - tails-${finalAttrs.version}.iso - ''; + sq verify \ + --signer-file=tails-signing.key \ + --signature-file=tails-${finalAttrs.version}.iso.sig \ + tails-${finalAttrs.version}.iso + ''; installPhase = '' cp tails-${finalAttrs.version}.iso "$out"; diff --git a/pkgs/by-name/ta/tails-iso/update.sh b/pkgs/by-name/ta/tails-iso/update.sh index 10336449..fbd0fc77 100755 --- a/pkgs/by-name/ta/tails-iso/update.sh +++ b/pkgs/by-name/ta/tails-iso/update.sh @@ -2,6 +2,10 @@ set -e +root="$(git rev-parse --show-toplevel)" + +cd "$root/pgks/by-name/ta/tails-iso/" + tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-url-XXXXXXXXXX")" cleanup() { chmod -R u+w "$tmpHomePath" @@ -43,12 +47,16 @@ get_sha256() { echo "$hash" } -old_version="$(jq .version --raw-output <./files.json)" new_version="$(curl --follow https://download.tails.net/tails/stable/ 2>/dev/null | html2text -links | grep --regexp='\s*[0-9]\. tails-amd64-' | sed 's/\s*[0-9]\. tails-amd64-\(.*\)\//\1/')" -if [ "$old_version" = "$new_version" ]; then - # No need to update. - exit 0 +# The `files.json` file might not be present, if a previous update failed. +if test -f ./files.json; then + old_version="$(jq .version --raw-output <./files.json)" + + if [ "$old_version" = "$new_version" ]; then + # No need to update. + exit 0 + fi fi final_version="amd64-$new_version" |
