mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix nautilus script installation to not crash when the nautilus script dir does not exist. Instead, only install scripts when the directory already exists.

Browse source 
nautilus creates this directory each time run, so this avoids putting cruft
in user's home
This commit is contained in:
Joey Hess 2014-04-05 16:36:47 -04:00
parent 66f7354dae
commit ade5d8ccc5
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Install.hs
View file

@ -87,8 +87,9 @@ installNautilus :: FilePath -> IO ()
#ifdef linux_HOST_OS #ifdef linux_HOST_OS
installNautilus program = do installNautilus program = do
scriptdir <- (\d -> d </> "nautilus" </> "scripts") <$> userDataDir scriptdir <- (\d -> d </> "nautilus" </> "scripts") <$> userDataDir
genscript scriptdir "get" whenM (doesDirectoryExist scriptdir) $ do
genscript scriptdir "drop" genscript scriptdir "get"
genscript scriptdir "drop"
where where
genscript scriptdir action = genscript scriptdir action =
installscript (scriptdir </> scriptname action) $ unlines installscript (scriptdir </> scriptname action) $ unlines

3
debian/changelog vendored
View file

@ -2,6 +2,9 @@ git-annex (5.20140403) UNRELEASED; urgency=medium
* git-annex-shell: Added notifychanges command. * git-annex-shell: Added notifychanges command.
* Improve display of dbus notifications. Thanks, Johan Kiviniemi. * Improve display of dbus notifications. Thanks, Johan Kiviniemi.
* Fix nautilus script installation to not crash when the nautilus script dir
does not exist. Instead, only install scripts when the directory already
exists.
-- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2014 15:05:44 -0400 -- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2014 15:05:44 -0400