Merge pull request #467 from thotypous/master

Fix dealing with filenames containing spaces

frontend/apps/filemanager/filemanager.lua

@@ -9,6 +9,7 @@ local FileChooser = require("ui/widget/filechooser")
 local VerticalSpan = require("ui/widget/verticalspan")
 local VerticalGroup = require("ui/widget/verticalgroup")
 local ButtonTable = require("ui/widget/buttontable")
+local GestureRange = require("ui/gesturerange")
 local UIManager = require("ui/uimanager")
 local Input = require("ui/input")
 local Font = require("ui/font")
@@ -221,14 +222,18 @@ end
 
 function FileManager:pasteHere(file)
 	if self.clipboard then
-		local program = self.cutfile and "mv " or "cp -r "
+		local orig = util.realpath(self.clipboard)
-		os.execute(program..util.realpath(self.clipboard).." "..util.realpath(file):match("(.*/)"))
+		local dest = util.realpath(file):match("(.*/)")
+		if self.cutfile then
+			util.execute("/bin/mv", orig, dest)
+		else
+			util.execute("/bin/cp", "-r", orig, dest)
+		end
 	end
 end
 
 function FileManager:deleteFile(file)
-	local program = "rm -r "
+	util.execute("/bin/rm", "-r", util.realpath(file))
-	os.execute(program..util.realpath(file))
 end
 
 return FileManager

koreader-base

@@ -1 +1 @@
-Subproject commit aa1328ca5d8812084cfb1adf45d809044f887379
+Subproject commit 6078a77d92580c5244f834e965d0fbed11ba917b