more work on the new installers

Author: SolidEva

scripts/InstallScripts/beta_InstallPackages.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-
 # This file is part of PrawnOS (https://www.prawnos.com)
-# Copyright (c) 2022 Hal Emmerich <hal@halemmerich.com>
+# Copyright (c) 2023 Eva Emmerich <eva@evaemmerich.com>
 
 # PrawnOS is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2
@@ -19,52 +18,89 @@
 
 import click
 from prompt_toolkit.shortcuts import button_dialog
-from tools import get_device_model
-
-# option helpers
-def validate_res(res, expected):
-    if res not in expected:
-        raise ValueError(f"{res} is not a valid option, expected one of {expected}")
+import libinstall
+import package_lists as pl
+import constants
 
 # option handlers
-de_answers = ["xfce", "gnome"]
-de_hint ="Choose a desktop envorionment to install. If you are unsure, pick Xfce" 
-def ask_de(options):
-    result = None
-    if (opt := options.get("de", None)):
-        result = opt
-    else:
-        result = button_dialog(
+all_handlers = {}
+
+DE_OPT = "de"
+DE_XFCE = "xfce"
+DE_GNOME = "gnome"
+DE_ANSWERS = [DE_XFCE, DE_GNOME]
+DE_DIALOG = button_dialog(
             title='Install Desktop Environment',
-            text=de_hint,
+            text="Choose a desktop envorionment to install. If you are unsure, pick Xfce",
             buttons=[
-                ('Xfce', "xfce"),
-                ('Gnome', "gnome"),
+                ('Xfce', DE_XFCE),
+                ('Gnome', DE_GNOME),
             ],
-        ).run()
-    validate_res(result, de_answers)
-    return result
-
-
-#TODO ensure all options end up in the all_answers map
-all_answers = {"de" : de_answers}
-def ask_all(options):
-    answers = all_answers
-    answers["de"] = ask_de(options)
-
-    return answers
+        )
 
+libinstall.register_opt(all_handlers, DE_OPT, DE_ANSWERS, DE_DIALOG)
 
 
 
 def main(options):
     #TODO take map of user prompted options to skip prompting
-    answers = ask_all(options)
+    answers = libinstall.ask_all(all_handlers, options)
 
-    model = get_device_model()
+    model = libinstall.get_device_model()
     print(model)
     print(answers)
 
+
+    #TODO set the timezone, and the time
+    packages = []
+    ## General packages
+    packages += pl.base_debs_download
+    packages += pl.prawnos_base_debs_prebuilt_download
+
+    ## Device Specific packages
+    if "veyron" in model:
+        packages += prawnos-veyron-config
+    elif "gru" in model:
+        packages += prawnos-gru-config
+
+    ## DE Specific packages
+    if answers[DE_OPT] == DE_GNOME:
+        packages += gnome_debs_download
+        packages += prawnos_gnome_debs_prebuilt_download
+
+    elif answers[DE_OPT] = DE_XFCE:
+        packages += xfce_debs_download
+        packages += prawnos_xfce_debs_prebuilt_download
+
+    libinstall.apt_install(packages)
+
+    # clean up some broken packages, and some not necessary
+    purge_packages = []
+    # TODO figure out what packages are pulling these in
+    purge_packages += gnome-software
+    purge_packages += lilyterm
+    # TODO debug why rotation is flipped
+    # work around issue #234
+    purge_packages += iio-sensor-proxy
+    # remove light-locker, as it is broken see issue #56
+    purge_packages += light-locker
+
+    libinstall.apt_purge(purge_packages)
+
+    #TODO need to wrap the following commands
+
+    #$ apt clean -y
+    #$ apt autoremove --purge -y
+
+    # reload the CA certificate symlinks
+    #$ update-ca-certificates --fresh
+
+    #enable periodic TRIM
+    #$ cp /lib/systemd/system/fstrim.{service,timer} /etc/systemd/system
+    # systemctl enable fstrim.timer
+
+
+
 @click.command()
 @click.option('--options_file', default=None)
 def cli(options_file):

scripts/InstallScripts/beta_InstallPrawnOS.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+
+# This file is part of PrawnOS (https://www.prawnos.com)
+# Copyright (c) 2023 Eva Emmerich <[email protected]>
+
+# PrawnOS is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+
+# PrawnOS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with PrawnOS.  If not, see <https://www.gnu.org/licenses/>.
+
+
+import click
+from prompt_toolkit.shortcuts import button_dialog
+import libinstall
+import constants
+
+# globals
+BOOT_DEVICE = libinstall.get_boot_device()
+BOOT_PARTITION = libinstall.get_boot_partition()
+
+# option handlers
+all_handlers = {}
+
+IE_OPT = "ie"
+IE_INSTALL = "install"
+IE_EXPAND = "expand"
+IE_ANSWERS = [IE_INSTALL, IS_EXPAND]
+IE_HINT = f"""
+---------------------------------------------------------------------------------------------------------------------
+PrawnOS Install or Expand Script
+Installation sets up the internal emmc partitions, root encryption, and copies the filesystem from the
+current boot device to the target device. The target device cannot be the current boot device
+
+Expansion simply targets the booted device, and expands the filesystem to fill the entire thing instead of just 2GB.
+Because of this, root encryption cannot be used when choosing expansion.
+
+For installation, this script can be quit and re-ran at any point.
+Unfortunately for expansion this is not the case
+---------------------------------------------------------------------------------------------------------------------
+
+Currently booted to: {BOOT_PARTITION}
+"""
+IE_DIALOG = button_dialog(
+            title='Expand or Install?',
+            text=IE_HINT,
+            buttons=[
+                ('Install', IE_INSTALL),
+                ('Expand', IE_EXPAND),
+            ],
+        )
+
+IE_HANDLER = libinstall.register_opt(all_handlers, IE_OPT, IE_ANSWERS, IE_DIALOG)
+
+
+INSTALL_OPT = "install"
+# TODO add handlers that get the emmc, sd, usb dev names.
+
+
+
+def main(options):
+    #TODO take map of user prompted options to skip prompting
+
+    ie_answer = IE_HANDLER.ask(options)
+    if IE_INSTALL == ie_answer:
+        # install path
+        pass
+
+    elif IE_EXPAND == ie_answer:
+        # expand path
+        pass
+
+    else:
+        raise ValueError(f"{ie_answer} does not contain install or expand")
+
+
+    model = libinstall.get_device_model()
+    print(model)
+    print(answers)
+
+
+@click.command()
+@click.option('--options_file', default=None)
+def cli(options_file):
+    if options_file:
+        #TODO load the json options file if provided
+        pass
+
+    options = {}
+    main(options)
+
+if __name__ == '__main__':
+    cli()
+

scripts/InstallScripts/libinstall.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+
+
+# This file is part of PrawnOS (https://www.prawnos.com)
+# Copyright (c) 2023 Hal Emmerich <[email protected]>
+
+# PrawnOS is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+
+# PrawnOS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with PrawnOS.  If not, see <https://www.gnu.org/licenses/>.
+
+
+
+from pathlib import Path
+
+RESOURCES = Path(/etc/prawnos/install/resources)
+SCRIPTS = Path(/etc/prawnos/install/scripts)
+
+def get_device_model():
+    f = open("/sys/firmware/devicetree/base/model", "r")
+    model = f.read().strip()
+    return model
+
+
+# Grab the boot partition, which is either /dev/sda2 for usb or /dev/mmcblk(0/1)p2 for an sd card
+def get_boot_partition():
+    cmd = ["lsblk", "-oMOUNTPOINT,PKNAME",  "-P"]
+    res = subprocess.run(cmd, check=True, capture_output=True, text=True)
+    for line in res.stdout.split("\n"):
+        if 'MOUNTPOINT="/"' in line:
+            # line looks like: MOUNTPOINT="/" PKNAME="mmcblk1p2"
+            #         or like: MOUNTPOINT="/" PKNAME="sda2"
+            devname = line.split("PKNAME=")[1].strip('"')
+
+    return f"/dev/{devname}"
+
+# Grab the boot device, which is either /dev/sda for usb or /dev/mmcblk(0/1) for an sd card
+def get_boot_device():
+    devname = get_boot_partition()
+    # strip off the partition
+    if "mmcblk" in devname:
+        devname = devname[:-2]
+    else:
+        devname = devname[:-1]
+
+    return devname
+
+#TODO add wrapper for apt
+# maybe use
+# https://apt-team.pages.debian.net/python-apt/library/index.html
+
+
+## Stubs for later use
+def apt_install(packages):
+    pass
+
+def apt_remove(packages):
+    pass
+
+def apt_purge(packages):
+    pass
+
+## Helper tools for handling  user provided installation options
+class OptHander():
+    def __init__(opt, answers, hint, dialog):
+        self.opt = opt
+        self.aswers = answers
+        self.hint = hint
+        self.dialog = dialog
+
+    def ask(options):
+        result = None
+        if (option := options.get(self.opt, None)):
+            result = option
+        else:
+            result = self.dialog.run()
+        if result not in self.answers:
+            raise ValueError(f"{result} is not a valid option, expected one of {self.answers}")
+        return result
+
+def register_opt(all_handlers, opt, answers, dialog)
+    handler = OptHander(opt, answers, hint, dialog)
+    all_handlers[opt] = handler
+    return handler
+
+def ask_all(all_handlers, options):
+    answers = {}
+    for opt, handler in all_handlers.items():
+        answers[opt] = handler(options)
+    return answers
+