diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 19:25:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 19:44:59 +0000 |
| commit | aee879c98f683d5b887d3acb844d141993abeed6 (patch) | |
| tree | 3019b76a7ee13b2a26b2cfebb1cc3a4b34665573 /pkgs/applications/networking | |
| parent | b0002f4816a5b6f48c96ff4c78622fae498ec086 (diff) | |
firefox-bin.updateScript: fix with GNUPGHOME
If GNUPGHOME is set in the environment, it takes precedence over HOME, so to avoid using a user's actual GNUPGHOME, we should override thiscc instead of HOME.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/update.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 6f89ea51ed485..d6593be8890cc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -23,7 +23,7 @@ in writeScript "update-${name}" '' set -eux pushd ${basePath} - HOME=`mktemp -d` + export GNUPGHOME=`mktemp -d` gpg --keyserver hkps://gpg.mozilla.org --recv-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 tmpfile=`mktemp` @@ -49,7 +49,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$GNUPGHOME/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` |