Merge branch 'master' into assistant

1 files changed, 21 insertions, 1 deletions

diff --git a/Init.hs b/Init.hs
index 8c000cc41..7e0f10405 100644
--- a/Init.hs
+++ b/Init.hs
@@ -20,6 +20,26 @@ import Logs.UUID
 import Annex.Version
 import Annex.UUID
 
+import System.Posix.User
+
+genDescription :: Maybe String -> Annex String
+genDescription (Just d) = return d
+genDescription Nothing = do
+	hostname <- getHostname
+	let at = if null hostname then "" else "@"
+	username <- clicketyclickety
+	reldir <- liftIO . relHome =<< fromRepo Git.repoPath
+	return $ concat [username, at, hostname, ":", reldir]
+	where
+		{- Haskell lacks uname(2) bindings, except in the
+		 - Bindings.Uname addon. Rather than depend on that,
+		 - use uname -n when available. -}
+		getHostname = liftIO $ catchDefaultIO uname_node ""
+		uname_node = takeWhile (/= '\n') <$>
+			readProcess "uname" ["-n"]	
+		clicketyclickety = liftIO $ userName <$>
+			(getUserEntryForID =<< getEffectiveUserID)
+
 initialize :: Maybe String -> Annex ()
 initialize mdescription = do
 	prepUUID
@@ -27,7 +47,7 @@ initialize mdescription = do
 	setVersion
 	gitPreCommitHookWrite
 	u <- getUUID
-	maybe (recordUUID u) (describeUUID u) mdescription
+	describeUUID u =<< genDescription mdescription
 
 uninitialize :: Annex ()
 uninitialize = do