Rename all occurences of gpg2 to gpg

This is in reaction to upstream commit
NixOS/nixpkgs@e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.

One of the changes in GnuPG 2.1.23 is that the main binary is now called
gpg instead of gpg2. See the full release announcement here:

https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000412.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 7 insertions, 7 deletions

diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 793a1727..bce6ea05 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -66,7 +66,7 @@ in {
       user.email = "aszlig@redmoonstudios.org";
       user.name = "aszlig";
       user.signingkey = "4DFD43EC834B6901BDA2BAAC1DE8E48E57DB5436";
-      gpg.program = "${pkgs.gnupg}/bin/gpg2";
+      gpg.program = "${pkgs.gnupg}/bin/gpg";
       push.default = "current";
       tar."tar.xz".command = "${pkgs.xz}/bin/xz -c";
       rebase.autosquash = true;
diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix
index 7d0059b6..24756a3e 100644
--- a/tests/programs/gnupg/default.nix
+++ b/tests/programs/gnupg/default.nix
@@ -63,7 +63,7 @@ in {
 
     $machine->nest("import snakeoil key", sub {
       $machine->succeed(ssh "${cliTestWithPassphrase ''
-        gpg2 --import ${./snakeoil.asc}
+        gpg --import ${./snakeoil.asc}
       ''}");
       $machine->succeed(ssh "${mkExpect ''
         expect gpg>
@@ -74,7 +74,7 @@ in {
         send y\r
         expect gpg>
         send save\r
-      '' "gpg2 --edit-key ECC15FE1"}");
+      '' "gpg --edit-key ECC15FE1"}");
     });
 
     subtest "test SSH agent support", sub {
@@ -112,25 +112,25 @@ in {
       $machine->execute(ssh "systemctl --user reload gpg-agent");
       $machine->succeed(ssh "${cliTestWithPassphrase ''
         echo encrypt me > to_encrypt
-        gpg2 -sea -r ECC15FE1 to_encrypt
+        gpg -sea -r ECC15FE1 to_encrypt
         rm to_encrypt
       ''}");
       $machine->succeed(ssh "${cliTest ''
-        [ "$(gpg2 -d to_encrypt.asc)" = "encrypt me" ]
+        [ "$(gpg -d to_encrypt.asc)" = "encrypt me" ]
       ''}");
     };
 
     subtest "test from X", sub {
       $machine->execute(ssh "systemctl --user reload gpg-agent");
       my $pid = $machine->succeed(xsu
-        'echo encrypt me | gpg2 -sea -r ECC15FE1 > encrypted_x.asc & echo $!'
+        'echo encrypt me | gpg -sea -r ECC15FE1 > encrypted_x.asc & echo $!'
       );
       chomp $pid;
       $machine->waitForText(qr/Passphrase/);
       $machine->screenshot("passphrase_dialog");
       $machine->sendChars("supersecret\n");
       $machine->waitUntilFails("kill -0 $pid");
-      $machine->succeed(xsu '[ "$(gpg2 -d encrypted_x.asc)" = "encrypt me" ]');
+      $machine->succeed(xsu '[ "$(gpg -d encrypted_x.asc)" = "encrypt me" ]');
     };
   '';
 }