From 2a5dcc5bf81e3a869c67001f4b2484b1fdd21071 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 2 May 2023 11:16:43 +0000 Subject: [PATCH] update pmostools --- .../__pycache__/bsconf.cpython-39.pyc | Bin 0 -> 242 bytes .../__pycache__/upgradeconf.cpython-39.pyc | Bin 0 -> 704 bytes pmostools/peptools/bsconf.py | 1 - pmostools/peptools/hub.py | 6 +- pmostools/peptools/images/rd.png | Bin 12549 -> 0 bytes pmostools/peptools/suggested.py | 28 +-- pmostools/peptools/upgrade.py | 169 ++++++++++++++++++ pmostools/peptools/upgradeconf.py | 32 ++++ pmostools/peptools/welcome.py | 10 -- pmostools/peptools/welconf.py | 10 +- 10 files changed, 219 insertions(+), 37 deletions(-) create mode 100644 pmostools/peptools/__pycache__/bsconf.cpython-39.pyc create mode 100644 pmostools/peptools/__pycache__/upgradeconf.cpython-39.pyc delete mode 100644 pmostools/peptools/images/rd.png create mode 100644 pmostools/peptools/upgrade.py create mode 100644 pmostools/peptools/upgradeconf.py diff --git a/pmostools/peptools/__pycache__/bsconf.cpython-39.pyc b/pmostools/peptools/__pycache__/bsconf.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4043bb31d1b7e1e94a2c7bde252f1d8bf1460d66 GIT binary patch literal 242 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 diff --git a/pmostools/peptools/suggested.py b/pmostools/peptools/suggested.py index 069d811..8174483 100644 --- a/pmostools/peptools/suggested.py +++ b/pmostools/peptools/suggested.py @@ -54,7 +54,7 @@ def check_web_browsers(): # ***Install Packages*** def install_atril(): """ Install atril """ - cmd = 'xfce4-terminal -e "sudo apt install atril" \ + cmd = 'xterm -e "sudo apt install atril" \ --title="Installing Atril Document Viewer" ' os.system(cmd) check_packages() @@ -62,7 +62,7 @@ def install_atril(): def install_parole(): """ Install parole """ - cmd = 'xfce4-terminal -e "sudo apt install parole" \ + cmd = 'xterm -e "sudo apt install parole" \ --title="Installing Parole" ' os.system(cmd) check_packages() @@ -70,7 +70,7 @@ def install_parole(): def install_gufw(): """ Install gufw """ - cmd = 'xfce4-terminal -e "sudo apt install gufw" \ + cmd = 'xterm -e "sudo apt install gufw" \ --title="Installing the Fire Wall" ' os.system(cmd) check_packages() @@ -78,7 +78,7 @@ def install_gufw(): def install_snap(): """ Install install snap""" - cmd = 'xfce4-terminal -e "sudo apt install snapd" \ + cmd = 'xterm -e "sudo apt install snapd" \ --title="Installing snap" ' os.system(cmd) check_packages() @@ -86,7 +86,7 @@ def install_snap(): def install_flatpak(): """ Install flatpak """ - cmd = 'xfce4-terminal -e "sudo apt install flatpak" \ + cmd = 'xterm -e "sudo apt install flatpak" \ --title="Installing flatpak" ' os.system(cmd) check_packages() @@ -94,7 +94,7 @@ def install_flatpak(): def install_store(): """ Install gnome store""" - cmd = 'xfce4-terminal -e "sudo apt install gnome-software" \ + cmd = 'xterm -e "sudo apt install gnome-software" \ --title="Installing the gnome store" ' os.system(cmd) check_packages() @@ -102,7 +102,7 @@ def install_store(): def install_timeshift(): """ Install timeshift""" - cmd = 'xfce4-terminal -e "sudo apt install timeshift" \ + cmd = 'xterm -e "sudo apt install timeshift" \ --title="Installing Timeshift" ' os.system(cmd) check_packages() @@ -111,7 +111,7 @@ def install_timeshift(): # ***Web browser defs*** def install_firefox(): """ Install firefox-esr """ - cmd = 'xfce4-terminal -e "sudo apt install firefox-esr" \ + cmd = 'xterm -e "sudo apt install firefox-esr" \ --title="Installing Fire Fox ESR" ' os.system(cmd) check_web_browsers() @@ -119,7 +119,7 @@ def install_firefox(): def install_konqueror(): """ Install konqueror """ - cmd = 'xfce4-terminal -e "sudo apt install konqueror" \ + cmd = 'xterm -e "sudo apt install konqueror" \ --title="Installing Konqueror" ' os.system(cmd) check_web_browsers() @@ -127,7 +127,7 @@ def install_konqueror(): def install_epiphany(): """ Install epiphany-browser """ - cmd = 'xfce4-terminal -e "sudo apt install epiphany-browser" \ + cmd = 'xterm -e "sudo apt install epiphany-browser" \ --title="Installing Gnome Web" ' os.system(cmd) check_web_browsers() @@ -135,7 +135,7 @@ def install_epiphany(): def install_tor(): """ Install torbrowser-launcher """ - cmd = 'xfce4-terminal -e "sudo apt install torbrowser-launcher" \ + cmd = 'xterm -e "sudo apt install torbrowser-launcher" \ --title="Installing Tor" ' os.system(cmd) check_web_browsers() @@ -143,7 +143,7 @@ def install_tor(): def install_qute(): """ Install install qutebrowser""" - cmd = 'xfce4-terminal -e "sudo apt install qutebrowser" \ + cmd = 'xterm -e "sudo apt install qutebrowser" \ --title="Installing QuteBrowser" ' os.system(cmd) check_web_browsers() @@ -151,7 +151,7 @@ def install_qute(): def install_chromium(): """ Install chromium""" - cmd = 'xfce4-terminal -e "sudo apt install chromium" \ + cmd = 'xterm -e "sudo apt install chromium" \ --title="Installing Chromium" ' os.system(cmd) check_web_browsers() @@ -159,7 +159,7 @@ def install_chromium(): def install_falkon(): """ Install falkon""" - cmd = 'xfce4-terminal -e "sudo apt install falkon" \ + cmd = 'xterm -e "sudo apt install falkon" \ --title="Installing falkom" ' os.system(cmd) check_web_browsers() diff --git a/pmostools/peptools/upgrade.py b/pmostools/peptools/upgrade.py new file mode 100644 index 0000000..93860e0 --- /dev/null +++ b/pmostools/peptools/upgrade.py @@ -0,0 +1,169 @@ +import os +import re +import subprocess +import shutil +import tkinter as tk +import ttkbootstrap as ttk +import upgradeconf + +# setting up window +pepupdate = upgradeconf.bbstyle +pepupdate.resizable(False, False) +WINDOW_HEIGHT = 230 +WINDOW_WIDTH = 370 + +# This will get the logged in user +gusr = os.getlogin() +spath = "/home/" + gusr + + + +# Source things +fpath = "/etc/apt/sources.list" +text = "bullseye" +settext = "bookworm" + + +def setsource(fpath, text, settext, flags=0): + """ Replace the source code names """ + with open(fpath,"r+") as file: + file_contents = file.read() + txt_pattern = re.compile(re.escape(text), flags) + file_contents = txt_pattern.sub(settext, file_contents) + file.seek(0) + file.truncate() + file.write(file_contents) + + +def movepins(): + """ Check if the Pins exists if they do move them + to backup folder + """ + pin_path = "/etc/apt/preferences.d/99pin-unstable" + bkup_path= spath + '/pin_backup' + if os.path.exists(pin_path): + os.mkdir(bkup_path) + print('Pin backup folder made') + shutil.copy(pin_path, bkup_path) + print('Pin file copied') + os.remove(pin_path) + print('Pin file deleted') + else: + pass + +def upgrade_cmd(): + # Put the commands together + set_terminal = 'xfce4-terminal -T \"Upgrade Peppermint" ' + call_bash = '-e \"bash -c ' + sudo_var = 'sudo apt ' + update_cmd = sudo_var + 'update' + upgrade_cmd = sudo_var + 'upgrade' + full_cmd = sudo_var + 'full-upgrade' + clean_cmd = sudo_var + 'clean' + remove_cmd = sudo_var + 'autoremove' + reboot_cmd = sudo_var + 'shutdown -r now' + installer_remove = sudo_var + 'remove calamares' + installer_settings = sudo_var + 'remove calamares-settings-debian' + xDaily = 'sudo xDaily' + # Commands to run + prep_go = (set_terminal + + call_bash + "'" + + update_cmd + ' && ' + + upgrade_cmd + ' && ' + + full_cmd + "'" + '"' + ) + + final_go = (set_terminal + + call_bash + "'" + + clean_cmd + ' && ' + + update_cmd + ' && ' + + upgrade_cmd + ' && ' + + full_cmd + ' && ' + + remove_cmd + ' && ' + + #reboot_cmd + ' && ' + + installer_remove + ' && ' + + installer_settings + ' && ' + + xDaily + "'" + '"' + ) + # Run the Commands in order + subprocess.Popen(prep_go, shell=True) + setsource(fpath, text, settext) + movepins() + subprocess.Popen(final_go, shell=True) + + + + + +def center_screen(): + """ gets the coordinates of the center of the screen """ + screen_width = pepupdate.winfo_screenwidth() + screen_height = pepupdate.winfo_screenheight() + # Coordinates of the upper left corner of the window to make the window + # appear in the center + x_cordinate = int((screen_width / 2) - (WINDOW_WIDTH / 2)) + y_cordinate = int((screen_height / 2) - (WINDOW_HEIGHT / 2)) + pepupdate.geometry("{}x{}+{}+{}".format(WINDOW_WIDTH, + WINDOW_HEIGHT, x_cordinate, y_cordinate)) +def ubase(): + """Check to see what base is being loaded""" + if os.path.exists("/etc/devuan_version"): + pepupdate.title(welconf.DEVUAN_TITLE) + lpath = upgradeconf.devcandy + l_g = tk.Label(pepupdate, image=lpath, width=128, height=128, borderwidth=0) + l_g.grid( + columnspan=2, + row=0, + column=0, + ipadx=5, + ipady=5, + padx=5, + pady=5) + elif os.path.exists("/etc/debian_version"): + pepupdate.title(upgradeconf.DEBIAN_TITLE) + +# Set the window icon +pepupdate.tk.call('wm', 'iconphoto', pepupdate._w, tk.PhotoImage( + file='/usr/share/pixmaps/peppermint-old.png')) + + +codename_label = ttk.Label(pepupdate, text="Enter the Codename to upgrade to:") +codename_label.place(x=10, y=20) + +examples_label = ttk.Label(pepupdate, text='** For example: bookworm, bullseye,' + ' stretch **', bootstyle="danger") +examples_label.place(x=10, y=80) + +warning_label = ttk.Label(pepupdate, text='Make sure to backup your data!', + bootstyle="warning") +warning_label.place(x=10, y=170) + +code_value = tk.Text(pepupdate, height=1, width=25) +code_value.place(x=10, y=45) + + +btnsv = ttk.Button( + pepupdate, + text="Upgrade", + cursor="hand2", + bootstyle="light-outline", + width=8, + command=upgrade_cmd + ) +btnsv.place(x=10, y=110) + +btncl = ttk.Button( + pepupdate, + text="Cancel", + cursor="hand2", + bootstyle="light-outline", + width=8 + ) +btncl.place(x=120, y=110) + + +ubase() +# call Center screen +center_screen() +# run the application +pepupdate.mainloop() diff --git a/pmostools/peptools/upgradeconf.py b/pmostools/peptools/upgradeconf.py new file mode 100644 index 0000000..b3293c9 --- /dev/null +++ b/pmostools/peptools/upgradeconf.py @@ -0,0 +1,32 @@ +""" +* Author: "PepDebian(peppermintosteam@proton.me) +* +* License: SPDX-License-Identifier: GPL-3.0-or-later +* +* this files should be used for the over all style and design of +* the Welcome Screen +""" +from tkinter import PhotoImage +import ttkbootstrap as ttk +import os + +# This will set the style to used for boostrap +# just change the name to what is needed for the +# the system +bbstyle = ttk.Window(themename="darkly") + +# set the title of the window +DEBIAN_TITLE = "Upgrade Peppermint - (Debian)" +DEVUAN_TITLE = "U@grade Peppermint - (Devuan)" + +# This will get the logged in user +gusr = os.getlogin() +spath = "/home/" + gusr + "/.local/share/pmostools/peptools" + + + + + + + + diff --git a/pmostools/peptools/welcome.py b/pmostools/peptools/welcome.py index efa3d05..68d1506 100755 --- a/pmostools/peptools/welcome.py +++ b/pmostools/peptools/welcome.py @@ -24,16 +24,6 @@ def wbase(): """Check to see what base is being loaded""" if os.path.exists("/etc/devuan_version"): pewel.title(welconf.DEVUAN_TITLE) - lpath = welconf.devcandy - l_g = tk.Label(pewel, image=lpath, width=128, height=128, borderwidth=0) - l_g.grid( - columnspan=2, - row=0, - column=0, - ipadx=5, - ipady=5, - padx=5, - pady=5) elif os.path.exists("/etc/debian_version"): pewel.title(welconf.DEBIAN_TITLE) diff --git a/pmostools/peptools/welconf.py b/pmostools/peptools/welconf.py index 56c815e..57989be 100644 --- a/pmostools/peptools/welconf.py +++ b/pmostools/peptools/welconf.py @@ -10,7 +10,7 @@ from tkinter import PhotoImage import ttkbootstrap as ttk import os -# This will set the style to used for boostrap +# This will set the style to used for bootstrap # just change the name to what is needed for the # the system bbstyle = ttk.Window(themename="darkly") @@ -19,14 +19,6 @@ bbstyle = ttk.Window(themename="darkly") DEBIAN_TITLE = "Welcome to Peppermint - (Debian)" DEVUAN_TITLE = "Welcome to Peppermint - (Devuan)" -# set the logo for the screen -#debcandy = PhotoImage(file='/home/tommy/Developer/bubbles/iso_configs/pmostools/peptools/images/' -# 'pep-logo-deb.png' - # ) -#devcandy = PhotoImage(file='/home/tommy/Developer/bubbles/iso_configs/pmostools/peptools/images/' -# 'pep-logo-dev.png' -# ) - # This will get the logged in user gusr = os.getlogin() spath = "/home/" + gusr + "/.local/share/pmostools/peptools"