Merge branch 'master' of https://github.com/jondot/gollum into jondot-master

This commit is contained in:
rick
2010-12-31 12:25:48 -06:00
+2 -1
View File
@@ -60,6 +60,7 @@ module Gollum
# normalize_dir("foo") # => "/foo" # normalize_dir("foo") # => "/foo"
# normalize_dir("/foo/") # => "/foo" # normalize_dir("/foo/") # => "/foo"
# normalize_dir("/") # => "" # normalize_dir("/") # => ""
# normalize_dir("c:/") # => ""
# #
# dir - String directory name. # dir - String directory name.
# #
@@ -68,7 +69,7 @@ module Gollum
def self.normalize_dir(dir) def self.normalize_dir(dir)
if dir if dir
dir = ::File.expand_path(dir, '/') dir = ::File.expand_path(dir, '/')
dir = '' if dir == '/' dir = '' if (dir == '/' || dir =~ /^.:\/$/)
end end
dir dir
end end