Revert "OCD fix for root install path having extra directory slash"

This reverts commit e4bf2d736a.

reverting previous commit
mdns
dchrastil 2017-06-12 10:05:40 -07:00
parent ec13f26056
commit 33c4f0bc6b
3 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@ class Listeners:
Load listeners from the install + "/lib/listeners/*" path Load listeners from the install + "/lib/listeners/*" path
""" """
rootPath = "%slib/listeners/" % (self.mainMenu.installPath) rootPath = "%s/lib/listeners/" % (self.mainMenu.installPath)
pattern = '*.py' pattern = '*.py'
print helpers.color("[*] Loading listeners from: %s" % (rootPath)) print helpers.color("[*] Loading listeners from: %s" % (rootPath))

View File

@ -38,7 +38,7 @@ class Modules:
""" """
if rootPath == '': if rootPath == '':
rootPath = "%slib/modules" % (self.mainMenu.installPath) rootPath = "%s/lib/modules/" % (self.mainMenu.installPath)
pattern = '*.py' pattern = '*.py'
print helpers.color("[*] Loading modules from: %s" % (rootPath)) print helpers.color("[*] Loading modules from: %s" % (rootPath))
@ -54,7 +54,7 @@ class Modules:
# extract just the module name from the full path # extract just the module name from the full path
moduleName = filePath.split(rootPath)[-1][0:-3] moduleName = filePath.split(rootPath)[-1][0:-3]
if rootPath != "%slib/modules/" % (self.mainMenu.installPath): if rootPath != "%s/lib/modules/" % (self.mainMenu.installPath):
moduleName = "external/%s" %(moduleName) moduleName = "external/%s" %(moduleName)
# instantiate the module and save it to the internal cache # instantiate the module and save it to the internal cache

View File

@ -45,7 +45,7 @@ class Stagers:
Load stagers from the install + "/lib/stagers/*" path Load stagers from the install + "/lib/stagers/*" path
""" """
rootPath = "%slib/stagers/" % (self.mainMenu.installPath) rootPath = "%s/lib/stagers/" % (self.mainMenu.installPath)
pattern = '*.py' pattern = '*.py'
print helpers.color("[*] Loading stagers from: %s" % (rootPath)) print helpers.color("[*] Loading stagers from: %s" % (rootPath))