From 331cd284de1de5f7192e1588b836f89337326784 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Oct 2022 14:22:46 +0000 Subject: move checkEnvironment -> checkenv --- src/backend/__init__.py | 2 +- src/backend/autoremove.py | 4 ++-- src/backend/installPkg.py | 4 ++-- src/backend/installSrc.py | 4 ++-- src/backend/searchPkg.py | 4 ++-- src/backend/setBranch.py | 4 ++-- src/backend/uninstallAll.py | 6 +++--- src/backend/updateAll.py | 10 +++++----- src/backend/upgradePkg.py | 4 ++-- src/backend/upgradeSrc.py | 4 ++-- src/frontend/cli/sisyphus-cli.py | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/backend/__init__.py b/src/backend/__init__.py index f0728d3..20b12a0 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -1,5 +1,5 @@ from .autoremove import * -from .checkEnvironment import * +from .checkenv import * from .getEnvironment import * from .getFilesystem import * from .installPkg import * diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py index 9b993ef..6b8938a 100644 --- a/src/backend/autoremove.py +++ b/src/backend/autoremove.py @@ -4,12 +4,12 @@ import atexit import io import subprocess import sys -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.killPortage import sisyphus.syncDatabase def start(): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask']) portageExec.wait() sisyphus.syncDatabase.localTable() diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py index 2a4f53d..55e9bb7 100644 --- a/src/backend/installPkg.py +++ b/src/backend/installPkg.py @@ -7,7 +7,7 @@ import shutil import subprocess import sys import wget -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getEnvironment import sisyphus.getFilesystem import sisyphus.killPortage @@ -16,7 +16,7 @@ import sisyphus.syncDatabase import sisyphus.updateAll def cliExec(pkgname): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() binhostURL = sisyphus.getEnvironment.binhostURL() diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py index 1f65312..8929041 100644 --- a/src/backend/installSrc.py +++ b/src/backend/installSrc.py @@ -6,7 +6,7 @@ import shutil import subprocess import sys import wget -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getEnvironment import sisyphus.getFilesystem import sisyphus.resolveDeps @@ -14,7 +14,7 @@ import sisyphus.syncDatabase import sisyphus.updateAll def cliExec(pkgname): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() binhostURL = sisyphus.getEnvironment.binhostURL() diff --git a/src/backend/searchPkg.py b/src/backend/searchPkg.py index 5e8540d..6773a7a 100644 --- a/src/backend/searchPkg.py +++ b/src/backend/searchPkg.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 import sqlite3 -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getFilesystem import sisyphus.updateAll @@ -125,7 +125,7 @@ def showSearch(filter, cat, pn, desc, single): print(f"\nFound {len(pkglist)} matching package(s) ...") def cliExec(filter, cat, pn, desc, single): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() else: print("\nYou are not root, cannot fetch updates.\nSearch result may be inaccurate!\n") diff --git a/src/backend/setBranch.py b/src/backend/setBranch.py index a2b1f62..601f606 100644 --- a/src/backend/setBranch.py +++ b/src/backend/setBranch.py @@ -4,7 +4,7 @@ import animation import git import os import sys -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getFilesystem import sisyphus.purgeEnvironment import sisyphus.setJobs @@ -80,7 +80,7 @@ def giveWarning(branch,remote): print("Examples : 'sisyphus mirror set 4' or 'sisyphus mirror set 8'\n") def cliExec(branch,remote): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.purgeEnvironment.branch() sisyphus.purgeEnvironment.metadata() injectGentooRepo(branch,remote) diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py index 4284867..e5c336d 100644 --- a/src/backend/uninstallAll.py +++ b/src/backend/uninstallAll.py @@ -4,12 +4,12 @@ import atexit import io import subprocess import sys -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.killPortage import sisyphus.syncDatabase def cliExec(pkgname): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname)) portageExec.wait() sisyphus.syncDatabase.localTable() @@ -17,7 +17,7 @@ def cliExec(pkgname): sys.exit("\nYou need root permissions to do this, exiting!\n") def cliExecForce(pkgname): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): portageExec = subprocess.Popen(['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname)) portageExec.wait() sisyphus.syncDatabase.localTable() diff --git a/src/backend/updateAll.py b/src/backend/updateAll.py index 41d4a3a..ed6a6cc 100644 --- a/src/backend/updateAll.py +++ b/src/backend/updateAll.py @@ -3,7 +3,7 @@ import animation import sys import time -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getEnvironment import sisyphus.purgeEnvironment import sisyphus.syncDatabase @@ -18,9 +18,9 @@ def syncAll(): @animation.wait('fetching updates') def cliExec(): - activeBranch = sisyphus.checkEnvironment.branch() + activeBranch = sisyphus.checkenv.branch() binhostURL = sisyphus.getEnvironment.binhostURL() - isSane = sisyphus.checkEnvironment.sanity() + isSane = sisyphus.checkenv.sanity() if isSane == 1: syncAll() @@ -32,9 +32,9 @@ def cliExec(): sys.exit("\nInvalid branch - binhost pairing; Use 'sisyphus branch --help' for help; Quitting.") def guiExec(): - activeBranch = sisyphus.checkEnvironment.branch() + activeBranch = sisyphus.checkenv.branch() binhostURL = sisyphus.getEnvironment.binhostURL() - isSane = sisyphus.checkEnvironment.sanity() + isSane = sisyphus.checkenv.sanity() if isSane == 1: syncAll() diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index a62408d..ec46cda 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -7,7 +7,7 @@ import shutil import subprocess import sys import wget -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getEnvironment import sisyphus.getFilesystem import sisyphus.killPortage @@ -16,7 +16,7 @@ import sisyphus.syncDatabase import sisyphus.updateAll def cliExec(): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() binhostURL = sisyphus.getEnvironment.binhostURL() diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index d2d4ec2..3335724 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -6,7 +6,7 @@ import shutil import subprocess import sys import wget -import sisyphus.checkEnvironment +import sisyphus.checkenv import sisyphus.getEnvironment import sisyphus.getFilesystem import sisyphus.resolveDeps @@ -14,7 +14,7 @@ import sisyphus.syncDatabase import sisyphus.updateAll def cliExec(): - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() binhostURL = sisyphus.getEnvironment.binhostURL() diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index b1b2e3f..5f8216a 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -177,7 +177,7 @@ def autoremove(): @app.command("update") def update(): """Update the Portage tree, the Redcore Overlay(s), Portage configs and Sisyphus's package database.""" - if sisyphus.checkEnvironment.root(): + if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() else: sys.exit("\nYou need root permissions to do this, exiting!\n") -- cgit v1.2.3