important update regarding default directories

This commit is contained in:
Miroslav Stampar
2010-02-25 15:22:41 +00:00
parent a10adcfe08
commit 0913d700a8
2 changed files with 19 additions and 14 deletions

View File

@@ -222,12 +222,15 @@ def getHtmlErrorFp():
return htmlParsed
def getDocRoot():
def getDocRoot(webApi=None):
docRoot = None
pagePath = directoryPath(conf.path)
if kb.os == "Windows":
defaultDocRoot = "C:/Inetpub/wwwroot/"
if webApi == "php":
defaultDocRoot = "C:/xampp/htdocs/"
else:
defaultDocRoot = "C:/Inetpub/wwwroot/"
else:
defaultDocRoot = "/var/www/"
@@ -270,11 +273,14 @@ def getDocRoot():
return docRoot
def getDirs():
def getDirs(webApi=None):
directories = set()
if kb.os == "Windows":
defaultDirs = ["C:/Inetpub/wwwroot/", "C:/xampp/htdocs/"]
if webApi == "php":
defaultDirs = ["C:/xampp/htdocs/"]
else:
defaultDirs = ["C:/Inetpub/wwwroot/"]
else:
defaultDirs = ["/var/www/"]