Changeset 111 for trunk/lua/cli.lua

Timestamp:

01/22/2012 09:39:50 PM (16 months ago)

Author:

reyalp

Message:

split filesystem / path utilities into fsutil

File:

• trunk/lua/cli.lua (modified) (3 diffs)

trunk/lua/cli.lua

@@ -533 +533 @@
                                                 end
                                         end
-                                        dst = util.joinpath(dst,util.basename(src))
+                                        dst = fsutil.joinpath(dst,fsutil.basename(src))
                                 else
                                         if not args.nolua then
                                                 local st = con:stat(dst)
                                                 if st and st.is_dir then
-                                                        dst = util.joinpath(dst,util.basename(src))
+                                                        dst = fsutil.joinpath(dst,fsutil.basename(src))
                                                 end
                                         end
                                 end
                         else
-                                dst = cli:make_camera_path(util.basename(src))
+                                dst = cli:make_camera_path(fsutil.basename(src))
                         end
 
@@ -577 +577 @@
                         if not dst then
                                 -- no dest, use final component of source path
-                                dst = util.basename(src)
+                                dst = fsutil.basename(src)
                         elseif string.match(dst,'[\\/]+$') then
                                 -- explicit / treat it as a directory
-                                dst = util.joinpath(dst,util.basename(src))
+                                dst = fsutil.joinpath(dst,fsutil.basename(src))
                                 -- and check if it is
-                                local dst_dir = util.dirname(dst)
+                                local dst_dir = fsutil.dirname(dst)
                                 -- TODO should create it
                                 if lfs.attributes(dst_dir,'mode') ~= 'directory' then
@@ -589 +589 @@
                         elseif lfs.attributes(dst,'mode') == 'directory' then
                                 -- if target is a directory download into it
-                                dst = util.joinpath(dst,util.basename(src))
+                                dst = fsutil.joinpath(dst,fsutil.basename(src))
                         end