diff --git a/DEBIAN/control b/DEBIAN/control index 6940a2b..691556c 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -1,10 +1,10 @@ Package: system-installer -Version: 2.4.7 +Version: 2.4.8 Maintainer: Thomas Castleman Homepage: https://github.com/drauger-os-development/system-installer Section: admin Architecture: amd64 Priority: important -Depends: arch-install-scripts, python3 (>=3.6.7-1~18.04), bash, gir1.2-gtk-3.0 (>=3.24.12-1ubuntu1), coreutils (>=8.28-1ubuntu1), apt (>=1.6.11), squashfs-tools (>=1:4.3-6ubuntu0.18.04.1), zenity (>=3.28.1-1), grub2-common (>=2.02-2ubuntu8.13), initramfs-tools (>=0.130ubuntu3.8), systemd (>=237-3ubuntu10.24), locales (>=2.27-3ubuntu1), procps (>=2:3.3.12-3ubuntu1.1), grep (>=3.1-2), keyboard-configuration, util-linux (>=2.34-0.1ubuntu2), python3-parted (>=3.11.2), python3-psutil (>=5.5.0), python3-apt (>=2.0.0), python3-pycurl, python3-gnupg (>=0.4.5), python3-xmltodict (>=0.11.0) +Depends: arch-install-scripts, python3 (>=3.6.7-1~18.04), bash, gir1.2-gtk-3.0 (>=3.24.12-1ubuntu1), coreutils (>=8.28-1ubuntu1), apt (>=1.6.11), squashfs-tools (>=1:4.3-6ubuntu0.18.04.1), zenity (>=3.28.1-1), grub2-common (>=2.02-2ubuntu8.13), initramfs-tools (>=0.130ubuntu3.8), systemd (>=237-3ubuntu10.24), locales (>=2.27-3ubuntu1), procps (>=2:3.3.12-3ubuntu1.1), grep (>=3.1-2), keyboard-configuration, util-linux (>=2.34-0.1ubuntu2), python3-parted (>=3.11.2), python3-psutil (>=5.5.0), python3-apt (>=2.0.0), python3-urllib3 (>=1.26.5-1~exp1), python3-gnupg (>=0.4.5), python3-xmltodict (>=0.11.0) Description: System Installer for Drauger OS System Installer for Drauger OS diff --git a/etc/system-installer/settings.json b/etc/system-installer/settings.json index 40bf2b2..6d05996 100644 --- a/etc/system-installer/settings.json +++ b/etc/system-installer/settings.json @@ -3,7 +3,7 @@ "local_repo": "/run/live/medium/repo", "distro": "Drauger OS", "report": { - "recv_keys": "https://download-optimizer.draugeros.org/keys/public_keys.asc", + "recv_keys": "https://download.draugeros.org/keys/public_keys.asc", "upload": "rsync://rsync.draugeros.org/reports-upload" }, "ping servers": [ diff --git a/usr/bin/system-installer.cxx b/usr/bin/system-installer.cxx index aea6502..ef4ba48 100644 --- a/usr/bin/system-installer.cxx +++ b/usr/bin/system-installer.cxx @@ -46,7 +46,7 @@ using namespace std; -str VERSION = "2.4.7"; +str VERSION = "2.4.8"; str R = "\033[0;31m"; str G = "\033[0;32m"; str Y = "\033[1;33m"; diff --git a/usr/share/system-installer/UI/report.py b/usr/share/system-installer/UI/report.py index 8a3c276..f9608ba 100755 --- a/usr/share/system-installer/UI/report.py +++ b/usr/share/system-installer/UI/report.py @@ -30,7 +30,7 @@ import json import gnupg import gi -import curl +import urllib3 # Configuration required to use some of these libs gi.require_version('Gtk', '3.0') @@ -319,12 +319,12 @@ def send_report(self, widget): try: # Get keys - cURL = curl.Curl() - with open("../../../etc/system-installer/settings.json", + http = urllib3.PoolManager() + with open("/etc/system-installer/settings.json", "r") as config: URL = json.load(config)["report"] - cURL.set_url(URL["recv_keys"]) - key = cURL.get().decode() + data = http.request("GET", URL["recv_keys"]).data + key = data.decode() # Import keys result = gpg.import_keys(key) # Encrypt file using newly imported keys diff --git a/usr/share/system-installer/engine.py b/usr/share/system-installer/engine.py index a0a1fc0..3a34a8c 100755 --- a/usr/share/system-installer/engine.py +++ b/usr/share/system-installer/engine.py @@ -168,7 +168,9 @@ def copy_log_to_disk(): common.eprint(f" ### {sys.argv[0]} CLOSED ### ") copy_log_to_disk() subprocess.Popen(["su", "live", "-c", - f"/usr/share/system-installer/success.py \'{json.dumps(SETTINGS)}\'"]) + f"/usr/share/system-installer/success.py \'{json.dumps(SETTINGS)}\'", + "1>/tmp/system-installer.log", + "2>/tmp/system-installer.log"], shell=True) os.kill(pid, 15) except Exception as error: os.kill(pid, 15)