From 344d58ae21bd0f5b260ef47547c4cef95ec9a23c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Oct 2022 23:09:04 +0100 Subject: rename : portageRepo -> gentooRepo --- src/backend/checkEnvironment.py | 4 ++-- src/backend/getFilesystem.py | 4 ++-- src/backend/purgeEnvironment.py | 12 ++++++------ src/backend/setBranch.py | 6 +++--- src/backend/syncEnvironment.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/checkEnvironment.py b/src/backend/checkEnvironment.py index 5a43780..200be15 100644 --- a/src/backend/checkEnvironment.py +++ b/src/backend/checkEnvironment.py @@ -11,8 +11,8 @@ def root(): def branch(): activeBranch = None - if os.path.isdir(os.path.join(sisyphus.getFilesystem.portageRepoDir, '.git')): - os.chdir(sisyphus.getFilesystem.portageRepoDir) + if os.path.isdir(os.path.join(sisyphus.getFilesystem.gentooRepoDir, '.git')): + os.chdir(sisyphus.getFilesystem.gentooRepoDir) localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) if localBranch.decode().strip() == 'master': diff --git a/src/backend/getFilesystem.py b/src/backend/getFilesystem.py index 4934108..5186db4 100644 --- a/src/backend/getFilesystem.py +++ b/src/backend/getFilesystem.py @@ -5,11 +5,11 @@ import platform remoteGitlab = 'https://gitlab.com/redcore' remotePagure = 'https://pagure.io/redcore' -portageRepo = 'portage.git' +gentooRepo = 'portage.git' redcoreRepo = 'redcore-desktop.git' portageConfigRepo = 'redcore-build.git' -portageRepoDir = '/usr/ports/gentoo' +gentooRepoDir = '/usr/ports/gentoo' redcoreRepoDir = '/usr/ports/redcore' portageConfigDir = '/opt/redcore-build' portageCacheDir = '/var/cache/packages' diff --git a/src/backend/purgeEnvironment.py b/src/backend/purgeEnvironment.py index 0eba801..701d4a9 100644 --- a/src/backend/purgeEnvironment.py +++ b/src/backend/purgeEnvironment.py @@ -7,14 +7,14 @@ import sisyphus.getFilesystem @animation.wait('purging branch configuration') def branch(): - if os.path.isdir(sisyphus.getFilesystem.portageRepoDir): - for files in os.listdir(sisyphus.getFilesystem.portageRepoDir): - if os.path.isfile(os.path.join(sisyphus.getFilesystem.portageRepoDir, files)): - os.remove(os.path.join(sisyphus.getFilesystem.portageRepoDir, files)) + if os.path.isdir(sisyphus.getFilesystem.gentooRepoDir): + for files in os.listdir(sisyphus.getFilesystem.gentooRepoDir): + if os.path.isfile(os.path.join(sisyphus.getFilesystem.gentooRepoDir, files)): + os.remove(os.path.join(sisyphus.getFilesystem.gentooRepoDir, files)) else: - shutil.rmtree(os.path.join(sisyphus.getFilesystem.portageRepoDir, files)) + shutil.rmtree(os.path.join(sisyphus.getFilesystem.gentooRepoDir, files)) else: - os.makedirs(sisyphus.getFilesystem.portageRepoDir) + os.makedirs(sisyphus.getFilesystem.gentooRepoDir) if os.path.isdir(sisyphus.getFilesystem.redcoreRepoDir): for files in os.listdir(sisyphus.getFilesystem.redcoreRepoDir): diff --git a/src/backend/setBranch.py b/src/backend/setBranch.py index d0fa834..0dac54f 100644 --- a/src/backend/setBranch.py +++ b/src/backend/setBranch.py @@ -40,7 +40,7 @@ def getBranchRemote(branch,remote): "Error: Invalid branch" + " " + "'" + str(branch) + "'" +" " + "(options : master, next)" ) - portageRemote = [remote, sisyphus.getFilesystem.portageRepo] + portageRemote = [remote, sisyphus.getFilesystem.gentooRepo] redcoreRemote = [remote, sisyphus.getFilesystem.redcoreRepo] portageConfigRemote = [remote, sisyphus.getFilesystem.portageConfigRepo] @@ -50,8 +50,8 @@ def getBranchRemote(branch,remote): def injectStage1(branch,remote): portageRemote,redcoreRemote,portageConfigRemote = getBranchRemote(branch,remote) - if not os.path.isdir(os.path.join(sisyphus.getFilesystem.portageRepoDir, '.git')): - git.Repo.clone_from("/".join(portageRemote), sisyphus.getFilesystem.portageRepoDir, depth=1, branch=branch) + if not os.path.isdir(os.path.join(sisyphus.getFilesystem.gentooRepoDir, '.git')): + git.Repo.clone_from("/".join(portageRemote), sisyphus.getFilesystem.gentooRepoDir, depth=1, branch=branch) @animation.wait('injecting Redcore Linux ebuild overlay') def injectStage2(branch,remote): diff --git a/src/backend/syncEnvironment.py b/src/backend/syncEnvironment.py index bd70a3c..db7d4d7 100644 --- a/src/backend/syncEnvironment.py +++ b/src/backend/syncEnvironment.py @@ -5,7 +5,7 @@ import subprocess import sisyphus.getFilesystem def syncStage1(): - os.chdir(sisyphus.getFilesystem.portageRepoDir) + os.chdir(sisyphus.getFilesystem.gentooRepoDir) localBranch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) remoteBranch = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}']) -- cgit v1.2.3