afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplified invoke install/uninstall task, since daemon no longer formally installs

Browse source
This commit is contained in:
Blake Harnden 2020-07-14 13:42:59 -07:00
parent 80194b3e38
commit be2f7e1cae
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
daemon/pyproject.toml
View file

@ -43,7 +43,6 @@ line_length = 88
line_length = 88 line_length = 88
exclude = ".+_pb2.*.py|doc/|build/|__pycache__/" exclude = ".+_pb2.*.py|doc/|build/|__pycache__/"
[build-system] [build-system]
requires = ["poetry>=0.12"] requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api" build-backend = "poetry.masonry.api"

16
tasks.py
View file

@ -8,8 +8,6 @@ from tempfile import NamedTemporaryFile
from invoke import task, Context from invoke import task, Context
DAEMON_DIR: str = "daemon" DAEMON_DIR: str = "daemon"
VCMD_DIR: str = "netns"
GUI_DIR: str = "gui"
DEFAULT_PREFIX: str = "/usr/local" DEFAULT_PREFIX: str = "/usr/local"
@ -121,11 +119,7 @@ def build(c: Context, hide: bool, prefix: str = DEFAULT_PREFIX) -> None:
def install_core(c: Context, hide: bool) -> None: def install_core(c: Context, hide: bool) -> None:
print("installing core vcmd...") print("installing core vcmd...")
with c.cd(VCMD_DIR): c.run("sudo make install", hide=hide)
c.run("sudo make install", hide=hide)
print("installing core gui...")
with c.cd(GUI_DIR):
c.run("sudo make install", hide=hide)
def install_poetry(c: Context, dev: bool, hide: bool) -> None: def install_poetry(c: Context, dev: bool, hide: bool) -> None:
@ -265,12 +259,8 @@ def uninstall(c, dev=False, verbose=False, prefix=DEFAULT_PREFIX):
uninstall core uninstall core
""" """
hide = not verbose hide = not verbose
print("uninstalling core-gui") print("uninstalling core")
with c.cd(GUI_DIR): c.run("sudo make uninstall", hide=hide)
c.run("sudo make uninstall", hide=hide)
print("uninstalling vcmd")
with c.cd(VCMD_DIR):
c.run("sudo make uninstall", hide=hide)
print("cleaning build directory") print("cleaning build directory")
c.run("make clean", hide=hide) c.run("make clean", hide=hide)
c.run("./bootstrap.sh clean", hide=hide) c.run("./bootstrap.sh clean", hide=hide)