more RawFilePath conversion

nukeFile replaced with removeWhenExistsWith removeLink, which allows
using RawFilePath. Utility.Directory cannot use RawFilePath since setup
does not depend on posix.

This commit was sponsored by Graham Spencer on Patreon.

Command/AddUrl.hs

@@ -326,7 +326,7 @@ downloadWeb addunlockedmatcher o url urlinfo file =
 		Left _ -> normalfinish tmp
 	  where
 		dl dest = withTmpWorkDir mediakey $ \workdir -> do
-			let cleanuptmp = pruneTmpWorkDirBefore tmp (liftIO . nukeFile)
+			let cleanuptmp = pruneTmpWorkDirBefore tmp (liftIO . removeWhenExistsWith removeLink)
 			showNote "using youtube-dl"
 			Transfer.notifyTransfer Transfer.Download url $
 				Transfer.download webUUID mediakey (AssociatedFile Nothing) Transfer.noRetry $ \p ->
@@ -446,7 +446,7 @@ addWorkTree _ addunlockedmatcher u url file key mtmp = case mtmp of
 			( do
 				when (isJust mtmp) $
 					logStatus key InfoPresent
-			, maybe noop (\tmp -> pruneTmpWorkDirBefore tmp (liftIO . nukeFile)) mtmp
+			, maybe noop (\tmp -> pruneTmpWorkDirBefore tmp (liftIO . removeWhenExistsWith removeLink)) mtmp
 			)
 	
 	-- git does not need to check ignores, because that has already

Command/DropUnused.hs

@@ -66,5 +66,5 @@ perform from numcopies key = case from of
 performOther :: (Key -> Git.Repo -> FilePath) -> Key -> CommandPerform
 performOther filespec key = do
 	f <- fromRepo $ filespec key
-	pruneTmpWorkDirBefore f (liftIO . nukeFile)
+	pruneTmpWorkDirBefore f (liftIO . removeWhenExistsWith removeLink)
 	next $ return True

Command/Fsck.hs

@@ -584,7 +584,7 @@ recordStartTime :: UUID -> Annex ()
 recordStartTime u = do
 	f <- fromRepo (gitAnnexFsckState u)
 	createAnnexDirectory $ parentDir f
-	liftIO $ nukeFile f
+	liftIO $ removeWhenExistsWith removeLink f
 	liftIO $ withFile f WriteMode $ \h -> do
 #ifndef mingw32_HOST_OS
 		t <- modificationTime <$> getFileStatus f
@@ -598,7 +598,8 @@ recordStartTime u = do
 	showTime = show
 
 resetStartTime :: UUID -> Annex ()
-resetStartTime u = liftIO . nukeFile =<< fromRepo (gitAnnexFsckState u)
+resetStartTime u = liftIO . removeWhenExistsWith removeLink
+	=<< fromRepo (gitAnnexFsckState u)
 
 {- Gets the incremental fsck start time. -}
 getStartTime :: UUID -> Annex (Maybe EpochTime)

Command/FuzzTest.hs

@@ -177,7 +177,8 @@ runFuzzAction (FuzzAdd (FuzzFile f)) = do
 	createWorkTreeDirectory (parentDir f)
 	n <- liftIO (getStdRandom random :: IO Int)
 	liftIO $ writeFile f $ show n ++ "\n"
-runFuzzAction (FuzzDelete (FuzzFile f)) = liftIO $ nukeFile f
+runFuzzAction (FuzzDelete (FuzzFile f)) = liftIO $
+	removeWhenExistsWith removeLink f
 runFuzzAction (FuzzMove (FuzzFile src) (FuzzFile dest)) = liftIO $
 	rename src dest
 runFuzzAction (FuzzDeleteDir (FuzzDir d)) = liftIO $

Command/Import.hs

@@ -175,13 +175,13 @@ startLocal o addunlockedmatcher largematcher mode (srcfile, destfile) =
 						| isDirectory s -> notoverwriting "(is a directory)"
 						| isSymbolicLink s -> ifM (Annex.getState Annex.force)
 							( do
-								liftIO $ nukeFile destfile
+								liftIO $ removeWhenExistsWith removeLink destfile
 								importfilechecked ld k
 							, notoverwriting "(is a symlink)"
 							)
 						| otherwise -> ifM (Annex.getState Annex.force)
 							( do
-								liftIO $ nukeFile destfile
+								liftIO $ removeWhenExistsWith removeLink destfile
 								importfilechecked ld k
 							, notoverwriting "(use --force to override, or a duplication option such as --deduplicate to clean up)"
 							)

Command/Lock.hs

@@ -89,7 +89,7 @@ perform file key = do
 		fs <- map (`fromTopFilePath` g)
 			<$> Database.Keys.getAssociatedFiles key
 		mfile <- firstM (isUnmodified key) fs
-		liftIO $ nukeFile obj
+		liftIO $ removeWhenExistsWith removeLink obj
 		case mfile of
 			Just unmodified ->
 				unlessM (checkedCopyFile key (fromRawFilePath unmodified) obj Nothing)

Command/Multicast.hs

@@ -84,7 +84,7 @@ genAddress = starting "gen-address" (ActionItemOther Nothing) (SeekInput []) $ d
 		KeyContainer s -> liftIO $ genkey (Param s)
 		KeyFile f -> do
 			createAnnexDirectory (takeDirectory f)
-			liftIO $ nukeFile f
+			liftIO $ removeWhenExistsWith removeLink f
 			liftIO $ protectedOutput $ genkey (File f)
 	case (ok, parseFingerprint s) of
 		(False, _) -> giveup $ "uftp_keymgt failed: " ++ s
@@ -210,7 +210,7 @@ storeReceived f = do
 	case deserializeKey (takeFileName f) of
 		Nothing -> do
 			warning $ "Received a file " ++ f ++ " that is not a git-annex key. Deleting this file."
-			liftIO $ nukeFile f
+			liftIO $ removeWhenExistsWith removeLink f
 		Just k -> void $
 			getViaTmpFromDisk RetrievalVerifiableKeysSecure AlwaysVerify k $ \dest -> unVerified $
 				liftIO $ catchBoolIO $ do

Command/P2P.hs

@@ -256,7 +256,7 @@ wormholePairing remotename ouraddrs ui = do
 			Wormhole.sendFile sendf observer wormholeparams
 				`concurrently`
 			Wormhole.receiveFile recvf producer wormholeparams
-		liftIO $ nukeFile sendf
+		liftIO $ removeWhenExistsWith removeLink sendf
 		if sendres /= True
 			then return SendFailed
 			else if recvres /= True

Command/Repair.hs

@@ -75,7 +75,7 @@ repairAnnexBranch modifiedbranches
 		Annex.Branch.forceCommit "committing index after git repository repair"
 		liftIO $ putStrLn "Successfully recovered the git-annex branch using .git/annex/index"
 	nukeindex = do
-		inRepo $ nukeFile . gitAnnexIndex
+		inRepo $ removeWhenExistsWith removeLink . gitAnnexIndex
 		liftIO $ putStrLn "Had to delete the .git/annex/index file as it was corrupt."
 	missingbranch = liftIO $ putStrLn "Since the git-annex branch is not up-to-date anymore. It would be a very good idea to run: git annex fsck --fast"
 

Command/Undo.hs

@@ -67,7 +67,7 @@ perform p = do
 
 	forM_ removals $ \di -> do
 		f <- mkrel di
-		liftIO $ nukeFile f
+		liftIO $ removeWhenExistsWith removeLink f
 
 	forM_ adds $ \di -> do
 		f <- mkrel di

Command/Vicfg.hs

@@ -57,7 +57,7 @@ vicfg curcfg f = do
 	unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, shellEscape f]]) $
 		giveup $ vi ++ " exited nonzero; aborting"
 	r <- parseCfg (defCfg curcfg) <$> liftIO (readFileStrict f)
-	liftIO $ nukeFile f
+	liftIO $ removeWhenExistsWith removeLink f
 	case r of
 		Left s -> do
 			liftIO $ writeFile f s