diff --git a/Makefile b/Makefile index 9d7877f..792e29e 100644 --- a/Makefile +++ b/Makefile @@ -11,5 +11,9 @@ cert: openssl req -new -x509 -keyout localhost.pem -out localhost.pem -nodes -days 365 testEnv: - python utils/parsePortage.py + python utils/parsePortage.py envMake + +testEnvUse: + python utils/parsePortage.py use + diff --git a/config.json b/config.json index 3694a82..221b863 100644 --- a/config.json +++ b/config.json @@ -5,11 +5,12 @@ "THEME": "default" }, "Portage":{ - "rootPth":"/etc/portgage", + "rootPth":"/etc/portage", "make.conf":"/etc/portage/make.conf/custom", + "package.use":"/etc/portage/package.use/custom", "package.accept_keywords":"/etc/portage/package.accept_keywords/custom", "package.mask":"/etc/portage/package.mask", - "package.unmask":"/etc/portage/package.unmask/custom", - "":"", + "package.unmask":"/etc/portage/package.unmask/custom" + } } \ No newline at end of file diff --git a/utils/parsePortage.py b/utils/parsePortage.py index 48b604c..bb3fd5b 100644 --- a/utils/parsePortage.py +++ b/utils/parsePortage.py @@ -41,13 +41,25 @@ class PortageConfig(): print(self.MakeConfig) def parsePackageUse(self): - Lines = self.getlines(self.Config.Portage['package.use']) + self.MakeConfig['package.use'] =[] + Lines = self.getLines(self.Config['Portage']['package.use']) + for i in Lines: + self.MakeConfig['package.use'].append(dict(Name=i.split(" ")[0], Uses=i.split(" ")[1:])) def parsePackageMasks(self): - Lines = self.getlines(self.Config.Portage['package.mask']) + Lines = self.getLines(self.Config['Portage']['package.mask']) + + def parsePakageUnmask(self): + Lines = self.getLines(self.Config['Portage']["package.unmask"]) + def parsePackageKeywords(self): - Lines = self.getlines(self.Config.Portage['package.accept_keywords']) + Lines = self.getLines(self.Config['Portage']['package.accept_keywords']) if __name__ == '__main__': Test = PortageConfig() - Test.parseMakeConf() + if sys.argv[1] == "envMake": + Test.parseMakeConf() + elif sys.argv[1] == "use": + Test.parsePackageUse() + else: + Test.parseMakeConf()