summaryrefslogtreecommitdiff
path: root/src/backend/installPkg.py
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-26 00:05:14 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-26 00:05:14 +0100
commitc7edab17a1b130b88010b26f1789da0569291676 (patch)
tree7ce8e192abcc5e106c2e2dc7c731bb13b054aa6b /src/backend/installPkg.py
parent3a0e9fe9197a931c1f10208d7690b9d72ac42530 (diff)
merge getCSV && getBinhost into getEnvironment
Diffstat (limited to 'src/backend/installPkg.py')
-rw-r--r--src/backend/installPkg.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py
index d827a3a..815eeb8 100644
--- a/src/backend/installPkg.py
+++ b/src/backend/installPkg.py
@@ -8,7 +8,7 @@ import subprocess
import sys
import wget
import sisyphus.checkEnvironment
-import sisyphus.getBinhost
+import sisyphus.getEnvironment
import sisyphus.getFilesystem
import sisyphus.killPortage
import sisyphus.resolveDeps
@@ -19,7 +19,7 @@ def start(pkgname):
if sisyphus.checkEnvironment.root():
sisyphus.updateAll.start()
- isBinhost = sisyphus.getBinhost.start()
+ binhostURL = sisyphus.getEnvironment.binhostURL()
areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package(pkgname)
if needsConfig == 0:
@@ -30,7 +30,7 @@ def start(pkgname):
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
- wget.download(isBinhost + binary)
+ wget.download(binhostURL + binary)
print("\n")
if os.path.isdir(os.path.join(sisyphus.getFilesystem.portageCacheDir, binary.rstrip().split("/")[0])):
@@ -63,14 +63,14 @@ def start(pkgname):
sys.exit("\nYou need root permissions to do this, exiting!\n")
def startqt(pkgname):
- isBinhost = sisyphus.getBinhost.start()
+ binhostURL = sisyphus.getEnvironment.binhostURL()
areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package.__wrapped__(pkgname) #undecorate
os.chdir(sisyphus.getFilesystem.portageCacheDir)
print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n")
for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
- wget.download(isBinhost + binary)
+ wget.download(binhostURL + binary)
print("\n")
if os.path.isdir(os.path.join(sisyphus.getFilesystem.portageCacheDir, binary.rstrip().split("/")[0])):