support gpg.program

When gpg.program is configured, it's used to get the command to run for
gpg. Useful on systems that have only a gpg2 command or want to use it
instead of the gpg command.

Assistant/WebApp/Configurators/Edit.hs

@@ -260,7 +260,8 @@ getRepoEncryption (Just _) (Just c) = case extractCipher c of
 	(Just (SharedCipher _)) ->
 		[whamlet|encrypted: encryption key stored in git repository|]
 	(Just (EncryptedCipher _ _ (KeyIds { keyIds = ks }))) -> do
-		knownkeys <- liftIO secretKeys
+		cmd <- liftAnnex $ gpgCmd <$> Annex.getGitConfig
+		knownkeys <- liftIO (secretKeys cmd)
 		[whamlet|
 encrypted using gpg key:
 <ul style="list-style: none">

Assistant/WebApp/Configurators/Local.hs

@@ -16,6 +16,7 @@ import Assistant.WebApp.MakeRemote
 import Assistant.Sync
 import Assistant.Restart
 import Annex.MakeRepo
+import qualified Annex
 import qualified Git
 import qualified Git.Config
 import qualified Git.Command
@@ -269,8 +270,9 @@ getConfirmAddDriveR drive = ifM (liftIO $ probeRepoExists dir)
   where
 	dir = removableDriveRepository drive
 	newrepo = do
+		cmd <- liftAnnex $ gpgCmd <$> Annex.getGitConfig
 		secretkeys <- sortBy (comparing snd) . M.toList
-			<$> liftIO secretKeys
+			<$> liftIO (secretKeys cmd)
 		page "Encrypt repository?" (Just Configuration) $
 			$(widgetFile "configurators/adddrive/encrypt")
 	knownrepo = getFinishAddDriveR drive NoRepoKey

Assistant/WebApp/Configurators/Ssh.hs

@@ -23,6 +23,7 @@ import Utility.Gpg
 import Types.Remote (RemoteConfig)
 import Git.Types (RemoteName, fromRef)
 import qualified Remote.GCrypt as GCrypt
+import qualified Annex
 import qualified Git.Construct
 import qualified Git.Config
 import qualified Git.Command
@@ -422,8 +423,9 @@ getConfirmSshR sshdata u
 	| otherwise = handleexisting =<< (M.lookup u <$> liftAnnex uuidMap)
   where
 	handlenew = sshConfigurator $ do
+		cmd <- liftAnnex $ gpgCmd <$> Annex.getGitConfig
 		secretkeys <- sortBy (comparing snd) . M.toList
-			<$> liftIO secretKeys
+			<$> liftIO (secretKeys cmd)
 		$(widgetFile "configurators/ssh/confirm")
 	handleexisting Nothing = sshConfigurator $
 		-- Not a UUID we know, so prompt about combining.
@@ -608,8 +610,9 @@ postAddRsyncNetR = do
 		
 		prepRsyncNet sshinput reponame $ \sshdata -> inpage $ 
 			checkExistingGCrypt sshdata $ do
+				cmd <- liftAnnex $ gpgCmd <$> Annex.getGitConfig
 				secretkeys <- sortBy (comparing snd) . M.toList
-					<$> liftIO secretKeys
+					<$> liftIO (secretKeys cmd)
 				$(widgetFile "configurators/rsync.net/encrypt")
 
 getMakeRsyncNetSharedR :: SshData -> Handler Html