refactor

Assistant/WebApp/Configurators/Local.hs

@@ -294,19 +294,15 @@ getFinishAddDriveR :: RemovableDrive -> RepoKey -> Handler Html
 getFinishAddDriveR drive = go
   where
   	{- Set up new gcrypt special remote. -}
-	go (RepoKey keyid) = ifM (liftIO $ inPath "git-remote-gcrypt")
-		( makewith $ \_ -> do
-			r <- liftAnnex $ addRemote $ 
-				initSpecialRemote remotename GCrypt.remote $ M.fromList
-					[ ("type", "gcrypt")
-					, ("gitrepo", dir)
-					, configureEncryption HybridEncryption
-					, ("keyid", keyid)
-					]
-			return (Types.Remote.uuid r, r)
-		, page "Encrypt repository" (Just Configuration) $
-			$(widgetFile "configurators/needgcrypt")
-		)
+	go (RepoKey keyid) = whenGcryptInstalled $ makewith $ const $ do
+		r <- liftAnnex $ addRemote $ 
+			initSpecialRemote remotename GCrypt.remote $ M.fromList
+				[ ("type", "gcrypt")
+				, ("gitrepo", dir)
+				, configureEncryption HybridEncryption
+				, ("keyid", keyid)
+				]
+		return (Types.Remote.uuid r, r)
 	go NoRepoKey = do
 		pr <- liftAnnex $ inRepo $ Git.GCrypt.probeRepo dir
 		case pr of

Assistant/WebApp/Gpg.hs

@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE QuasiQuotes, TemplateHaskell #-}
+{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
 
 module Assistant.WebApp.Gpg where
 
@@ -72,3 +72,10 @@ getGCryptRemoteName u repoloc = do
 		)
 	void $ inRepo $ Git.Remote.remove tmpremote
 	return mname
+
+whenGcryptInstalled :: Handler Html -> Handler Html
+whenGcryptInstalled a = ifM (liftIO $ inPath "git-remote-gcrypt")
+	( a
+	, page "Need git-remote-gcrypt" (Just Configuration) $
+		$(widgetFile "configurators/needgcrypt")
+	)