summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-16 17:19:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-16 17:19:39 -0400
commitc0f0d3c21f1086556f8eaaaca147094971f77357 (patch)
treeb61b7d0c792409052ada3615680bfcbc4bcdee9d
parent5d0ca95917f12fba31196ac18cb9682146b0dc3e (diff)
Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users.
-rw-r--r--Assistant/Install.hs6
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 3 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 89025cdae..84dc779d4 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -92,9 +92,9 @@ installNautilus :: FilePath -> IO ()
#ifdef linux_HOST_OS
installNautilus program = do
scriptdir <- (\d -> d </> "nautilus" </> "scripts") <$> userDataDir
- whenM (doesDirectoryExist scriptdir) $ do
- genscript scriptdir "get"
- genscript scriptdir "drop"
+ createDirectoryIfMissing True scriptdir
+ genscript scriptdir "get"
+ genscript scriptdir "drop"
where
genscript scriptdir action =
installscript (scriptdir </> scriptname action) $ unlines
diff --git a/debian/changelog b/debian/changelog
index 42ab381d8..42f836bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ git-annex (5.20140710) UNRELEASED; urgency=medium
This is a security/usability tradeoff. To avoid exposing the gpg key
ids who can decrypt the repository, users can unset
gcrypt-publish-participants.
+ * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet
+ exist, since it is not automatically created for Gnome 3 users.
-- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 23:29:21 -0400