Update installation method and bump deps

This commit is contained in:
2020-01-24 22:15:38 +01:00
parent 68435e140d
commit 9370bb4e02
10 changed files with 151 additions and 56 deletions

View File

@@ -478,7 +478,7 @@ operationFinal mygui myview mitem = withErrorDialog $ do
newFile :: MyGUI -> MyView -> IO ()
newFile _ myview = withErrorDialog $ do
mfn <- textInputDialog "Enter file name" ("" :: String)
let pmfn = P.parseFn =<< fromString <$> mfn
let pmfn = P.parseRel =<< fromString <$> mfn
for_ pmfn $ \fn -> do
cdir <- getCurrentDir myview
createRegularFile newFilePerms (path cdir P.</> fn)
@@ -488,7 +488,7 @@ newFile _ myview = withErrorDialog $ do
newDir :: MyGUI -> MyView -> IO ()
newDir _ myview = withErrorDialog $ do
mfn <- textInputDialog "Enter directory name" ("" :: String)
let pmfn = P.parseFn =<< fromString <$> mfn
let pmfn = P.parseRel =<< fromString <$> mfn
for_ pmfn $ \fn -> do
cdir <- getCurrentDir myview
createDir newDirPerms (path cdir P.</> fn)
@@ -498,7 +498,7 @@ renameF :: [Item] -> MyGUI -> MyView -> IO ()
renameF [item] _ _ = withErrorDialog $ do
iname <- P.fromRel <$> (P.basename $ path item)
mfn <- textInputDialog "Enter new file name" (iname :: ByteString)
let pmfn = P.parseFn =<< fromString <$> mfn
let pmfn = P.parseRel =<< fromString <$> mfn
for_ pmfn $ \fn -> do
let cmsg = "Really rename \"" ++ getFPasStr item
++ "\"" ++ " to \""

View File

@@ -171,7 +171,7 @@ fileCollisionDialog t = do
ResponseUser 4 -> do
mfn <- textInputDialog (fromString "Enter new name") (takeFileName t)
forM mfn $ \fn -> do
pfn <- P.parseFn (fromString fn)
pfn <- P.parseRel (fromString fn)
return $ Rename pfn
_ -> throwIO UnknownDialogButton
@@ -196,7 +196,7 @@ renameDialog t = do
ResponseUser 2 -> do
mfn <- textInputDialog (fromString "Enter new name") (takeFileName t)
forM mfn $ \fn -> do
pfn <- P.parseFn (fromString fn)
pfn <- P.parseRel (fromString fn)
return $ Rename pfn
_ -> throwIO UnknownDialogButton