summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/__init__.py4
-rw-r--r--src/backend/installebuild.py (renamed from src/backend/installhybrid.py)0
-rw-r--r--src/backend/upgradeebuild.py (renamed from src/backend/upgradehybrid.py)0
-rwxr-xr-xsrc/frontend/cli/sisyphus-cli.py11
4 files changed, 6 insertions, 9 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index ec1e6b0..493819a 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -9,7 +9,7 @@ from .database import *
from .filesystem import *
from .help import *
from .install import *
-from .installhybrid import *
+from .installebuild import *
from .killportage import *
from .metadata import *
from .mirror import *
@@ -25,4 +25,4 @@ from .uninstallforce import *
from .uninstall import *
from .update import *
from .upgrade import *
-from .upgradehybrid import *
+from .upgradeebuild import *
diff --git a/src/backend/installhybrid.py b/src/backend/installebuild.py
index 36704f3..36704f3 100644
--- a/src/backend/installhybrid.py
+++ b/src/backend/installebuild.py
diff --git a/src/backend/upgradehybrid.py b/src/backend/upgradeebuild.py
index d2961d6..d2961d6 100644
--- a/src/backend/upgradehybrid.py
+++ b/src/backend/upgradeebuild.py
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 7b9e858..74cdb2f 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -4,7 +4,6 @@ import sisyphus
import typer
from typing import List
from enum import Enum
-import sys
app = typer.Typer()
mirrorSetup = typer.Typer()
@@ -19,10 +18,6 @@ def app_callback(ctx: typer.Context):
Use 'sisyphus COMMAND --help' for detailed usage.
"""
ctx.info_name = 'sisyphus'
- if not '--help' in sys.argv:
- sisyphus.check.update()
- sisyphus.setjobs.start.__wrapped__() # undecorate
-
@app.command("search")
def search(pkgname: List[str]):
@@ -51,7 +46,7 @@ def install(pkgname: List[str], ebuild: bool = typer.Option(False, "--ebuild", "
if not ebuild:
sisyphus.install.start(pkgname)
else:
- sisyphus.installhybrid.start(pkgname)
+ sisyphus.installebuild.start(pkgname)
@app.command("uninstall")
def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "-f")):
@@ -127,7 +122,7 @@ def upgrade(ebuild: bool = typer.Option(False, "--ebuild", "-e")):
if not ebuild:
sisyphus.upgrade.start()
else:
- sisyphus.upgradehybrid.start()
+ sisyphus.upgradeebuild.start()
@app.command("spmsync")
def spmsync():
@@ -199,4 +194,6 @@ def mirrorset(index: int):
sisyphus.mirror.setActive(index)
if __name__ == "__main__":
+ sisyphus.check.update()
+ sisyphus.setjobs.start.__wrapped__() # undecorate
app()