Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
chore: don't try to indent XML with Augeas
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcanevet
mcanevet committed Jun 15, 2021
1 parent 5dcbd8c commit dcfb536
Showing 1 changed file with 4 additions and 63 deletions.
67 changes: 4 additions & 63 deletions geco/profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,39 +147,23 @@ def patch_config_plist(self):
logging.debug("Remove warnings")
a.remove("string[preceding-sibling::key[#text =~ regexp('^#WARNING - .*')]]")
a.remove("key[#text =~ regexp('^#WARNING - .*')]")
# FIXME: somehow this does not work here while it works in augtool
# a.set("#text[1]", "\n\t")
for _ in range(8):
a.remove("#text[2]")

logging.debug("Adding ACPI files to Config.plist")
directory = self.efi_dir + "/OC/ACPI"
a.defvar("ACPI", "dict[preceding-sibling::key[#text='ACPI']][1]")
a.defvar("ACPI_Add", "$ACPI/array[preceding-sibling::key[#text='Add']][1]")
a.remove("$ACPI_Add/dict")
# FIXME: somehow this does not work here while it works in augtool
a.set("$ACPI_Add/#text[1]", "\n\t\t\t")
for entry in glob.iglob(directory + '/*.aml'):
logging.debug("Found aml file: " + os.path.basename(entry))
a.set("$ACPI_Add/dict[last()+1]/#text", "\n\t\t\t\t")

a.set("$ACPI_Add/dict[last()]/key[last()+1]/#text", "Comment")
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$ACPI_Add/dict[last()+1]/key[last()+1]/#text", "Comment")
a.set("$ACPI_Add/dict[last()]/string[last()+1]/#text", os.path.basename(entry))
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$ACPI_Add/dict[last()]/key[last()+1]/#text", "Path")
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$ACPI_Add/dict[last()]/string[last()+1]/#text", os.path.basename(entry))
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$ACPI_Add/dict[last()]/key[last()+1]/#text", "Enabled")
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$ACPI_Add/dict[last()]/true[last()+1]", "#empty")
a.set("$ACPI_Add/dict[last()]/#text[last()+1]", "\t\t\t")

a.insert("$ACPI_Add/dict[last()]", "#text")
a.set("$ACPI_Add/#text[last()]", "\t\t\t")

logging.debug("Adding Kexts to Config.plist")
directory = self.efi_dir + "/OC/Kexts"
Expand All @@ -188,107 +172,65 @@ def patch_config_plist(self):
a.remove("$Kernel_Add/dict")
for entry in glob.iglob(directory + '/**/*.kext', recursive=True):
logging.debug("Found Kext: " + os.path.basename(entry))
a.set("$Kernel_Add/dict[last()+1]/#text", "\n\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "Comment")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()+1]/key[last()+1]/#text", "Comment")
a.set("$Kernel_Add/dict[last()]/string[last()+1]", None)
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "MaxKernel")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]", None)
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "PlistPath")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]/#text", "Contents/Info.plist")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "Enabled")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/true[last()+1]", "#empty")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "MinKernel")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]", None)
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "ExecutablePath")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]/#text", "Contents/MacOS/" + os.path.splitext(os.path.basename(entry))[0])
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "Arch")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]/#text", "Any")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Kernel_Add/dict[last()]/key[last()+1]/#text", "BundlePath")
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Kernel_Add/dict[last()]/string[last()+1]/#text", os.path.relpath(entry, directory))
a.set("$Kernel_Add/dict[last()]/#text[last()+1]", "\t\t\t")

a.insert("$Kernel_Add/dict[last()]", "#text")
a.set("$Kernel_Add/#text[last()]", "\t\t\t")

logging.debug("Adding Tools to Config.plist")
directory = self.efi_dir + "/OC/Tools"
a.defvar("Misc", "dict[preceding-sibling::key[#text='Misc']][1]")
a.defvar("Tools", "$Misc/array[preceding-sibling::key[#text='Tools']][1]")
a.remove("$Tools/dict")
for entry in glob.iglob(directory + '/*.efi'):
logging.debug("Found Kext: " + os.path.basename(entry))
a.set("$Tools/dict[last()+1]/#text", "\n\t\t\t\t")
logging.debug("Found Tool: " + os.path.basename(entry))

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Comment")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()+1]/key[last()+1]/#text", "Comment")
a.set("$Tools/dict[last()]/string[last()+1]/#text", os.path.basename(entry))
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "RealPath")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/false[last()+1]", "#empty")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Flavour")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/string[last()+1]/#text", "Auto")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Name")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/string[last()+1]/#text", os.path.basename(entry))
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "TextMode")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/false[last()+1]", "#empty")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Enabled")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/true[last()+1]", "#empty")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Arguments")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/string[last()+1]", None)
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Path")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/string[last()+1]/#text", os.path.basename(entry))
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")

a.set("$Tools/dict[last()]/key[last()+1]/#text", "Auxiliary")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t\t")
a.set("$Tools/dict[last()]/true[last()+1]", "#empty")
a.set("$Tools/dict[last()]/#text[last()+1]", "\t\t\t")

a.insert("$Tools/dict[last()]", "#text")
a.set("$Tools/#text[last()]", "\t\t\t")

logging.debug("Adding Drivers to Config.plist")
directory = self.efi_dir + "/OC/Drivers"
Expand All @@ -297,7 +239,6 @@ def patch_config_plist(self):
a.remove("$Drivers/string")
for entry in glob.iglob(directory + '/*.efi'):
logging.debug("Found Drivers: " + os.path.basename(entry))
a.set("$Drivers/#text[last()+1]", "\t\t\t")
a.set("$Drivers/string[last()+1]/#text", os.path.basename(entry))

with open(self.path + "/config.augtool", "r") as file:
Expand Down

0 comments on commit dcfb536

Please sign in to comment.