lib/sysadmin/dir_ext.rb in sysadmin-0.1.5 vs lib/sysadmin/dir_ext.rb in sysadmin-0.2.0

@@ -1,35 +1,33 @@
 # Name::      Sysadmin::DirExtension
 # Author::    774 <http://id774.net>
 # Created::   Jul 17, 2012
-# Updated::   Jul 17, 2012
+# Updated::   Nov 22, 2013
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Sysadmin
   module DirExtension
 
     def Dir.filelist(dir, sub_directory = false)
       array = Array.new
+
       if (FileTest.file?(dir))
         array << dir
       else
-        if sub_directory
-          dir = dir + "/**/"
-        else
-          dir = dir + "/"
-        end
+        dir = sub_directory ? dir + "/**/" : dir = dir + "/"
         Dir::glob(dir).each do |d|
           if (FileTest.directory?(d))
             Dir::foreach(d) do |f|
               if (FileTest.file?(d+f))
                 array << d+f
               end
             end
           end
         end
       end
-      return array
+
+      array
     end
 
   end
 end