diff options
| -rw-r--r-- | src/backend/__init__.py | 8 | ||||
| -rw-r--r-- | src/backend/pkgadd.py (renamed from src/backend/binpkgsrcinst.py) | 0 | ||||
| -rw-r--r-- | src/backend/pkgremove.py (renamed from src/backend/binpkgsrcunst.py) | 0 | ||||
| -rw-r--r-- | src/backend/setprofile.py | 4 | ||||
| -rw-r--r-- | src/backend/sysclean.py (renamed from src/backend/binpkgsrcautorm.py) | 2 | ||||
| -rw-r--r-- | src/backend/sysupgrade.py (renamed from src/backend/binpkgsrcupgd.py) | 0 | ||||
| -rwxr-xr-x | src/frontend/cli/sisyphus-cli.py | 14 | ||||
| -rw-r--r-- | src/frontend/gui/sisyphus-gui.py | 8 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py index aedf50b..2f87096 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -1,13 +1,11 @@ -from .binpkgsrcautorm import * -from .binpkgsrcinst import * -from .binpkgsrcunst import * -from .binpkgsrcupgd import * from .checkenv import * from .dlbinpkg import * from .getclr import * from .getenv import * from .getfs import * from .killemerge import * +from .pkgadd import * +from .pkgremove import * from .purgeenv import * from .recoverdb import * from .solvedeps import * @@ -21,4 +19,6 @@ from .syncall import * from .syncdb import * from .syncenv import * from .syncspm import * +from .sysclean import * from .sysinfo import * +from .sysupgrade import * diff --git a/src/backend/binpkgsrcinst.py b/src/backend/pkgadd.py index 091502b..091502b 100644 --- a/src/backend/binpkgsrcinst.py +++ b/src/backend/pkgadd.py diff --git a/src/backend/binpkgsrcunst.py b/src/backend/pkgremove.py index b039f96..b039f96 100644 --- a/src/backend/binpkgsrcunst.py +++ b/src/backend/pkgremove.py diff --git a/src/backend/setprofile.py b/src/backend/setprofile.py index 5d2f42d..e4da0aa 100644 --- a/src/backend/setprofile.py +++ b/src/backend/setprofile.py @@ -17,7 +17,7 @@ signal.signal(signal.SIGINT, sigint_handler) def start(): if platform.uname()[4] == 'x86_64': e_exe = subprocess.Popen( - ['eselect', 'profile', 'set', 'default/linux/amd64/17.1/hardened']) + ['eselect', 'profile', 'set', 'default/linux/amd64/23.0/split-usr/hardened']) try: e_exe.wait() except KeyboardInterrupt: @@ -30,7 +30,7 @@ def start(): if platform.uname()[4] == 'aarch64': e_exe = subprocess.Popen( - ['eselect', 'profile', 'set', 'default/linux/arm64/17.0']) + ['eselect', 'profile', 'set', 'default/linux/arm64/23.0/split-usr']) try: e_exe.wait() except KeyboardInterrupt: diff --git a/src/backend/binpkgsrcautorm.py b/src/backend/sysclean.py index 1036f66..937c8ec 100644 --- a/src/backend/binpkgsrcautorm.py +++ b/src/backend/sysclean.py @@ -45,7 +45,7 @@ def start(gfx_ui=False): args = ['--quiet', '--depclean'] if sisyphus.checkenv.root() and not gfx_ui: - print(f"\n{sisyphus.getclr.bright_white}Packages identified as orphaned and no longer needed are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") + print(f"\n{sisyphus.getclr.bright_white}Orphaned and no longer needed packages are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") while True: user_input = input( f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") diff --git a/src/backend/binpkgsrcupgd.py b/src/backend/sysupgrade.py index f8b01d2..f8b01d2 100644 --- a/src/backend/binpkgsrcupgd.py +++ b/src/backend/sysupgrade.py diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 8e6ec04..4e7d856 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -135,10 +135,10 @@ def install(pkgname: List[str], sisyphus install -e --nodeps vivaldi\n """ if ebuild: - sisyphus.binpkgsrcinst.start( + sisyphus.pkgadd.start( pkgname, ebuild=True, gfx_ui=False, oneshot=oneshot, nodeps=nodeps) else: - sisyphus.binpkgsrcinst.start( + sisyphus.pkgadd.start( pkgname, ebuild=False, gfx_ui=False, oneshot=oneshot, nodeps=nodeps) @@ -165,10 +165,10 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", " sisyphus uninstall openrc -f # this will succeed, but the system will no longer boot\n """ if force: - sisyphus.binpkgsrcunst.start( + sisyphus.pkgremove.start( pkgname, depclean=False, gfx_ui=False, unmerge=True) else: - sisyphus.binpkgsrcunst.start( + sisyphus.pkgremove.start( pkgname, depclean=True, gfx_ui=False, unmerge=False) @@ -186,7 +186,7 @@ def autoremove(): * Examples:\n sisyphus autoremove\n """ - sisyphus.binpkgsrcautorm.start(gfx_ui=False) + sisyphus.sysclean.start(gfx_ui=False) @app.command("autoclean") @@ -233,9 +233,9 @@ def upgrade( sisyphus upgrade -e\n """ if ebuild: - sisyphus.binpkgsrcupgd.start(ebuild=True, gfx_ui=False) + sisyphus.sysupgrade.start(ebuild=True, gfx_ui=False) else: - sisyphus.binpkgsrcupgd.start(ebuild=False, gfx_ui=False) + sisyphus.sysupgrade.start(ebuild=False, gfx_ui=False) @app.command("spmsync") diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index b86561e..1eb4b72 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -461,7 +461,7 @@ class MainWorker(QtCore.QObject): def startInstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.binpkgsrcinst.start( + sisyphus.pkgadd.start( pkgname, ebuild=False, gfx_ui=True, oneshot=False, nodeps=False) self.finished.emit() @@ -469,20 +469,20 @@ class MainWorker(QtCore.QObject): def startUninstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.binpkgsrcunst.start( + sisyphus.pkgremove.start( pkgname, depclean=True, gfx_ui=True, unmerge=False) self.finished.emit() @QtCore.pyqtSlot() def startUpgrade(self): self.started.emit() - sisyphus.binpkgsrcupgd.start(ebuild=False, gfx_ui=True) + sisyphus.sysupgrade.start(ebuild=False, gfx_ui=True) self.finished.emit() @QtCore.pyqtSlot() def startAutoremove(self): self.started.emit() - sisyphus.binpkgsrcautorm.start(gfx_ui=True) + sisyphus.sysclean.start(gfx_ui=True) self.finished.emit() |