Compare commits

..

No commits in common. "09f39befa72dc7cf551cdb5f8f37508d5b988c5c" and "0562772dc877bc9dc707af7cf62cc47320c567e9" have entirely different histories.

2 changed files with 21 additions and 23 deletions

View file

@ -1,4 +1,4 @@
__version__ = "v0.2.5-6"
__version__ = "0.2.5-5"
__author__ = "Reid D. 'arrdem' McKenzie <me@arrdem.com>"
__copyright__ = "Copyright 2020"
__license__ = "https://anticapitalist.software/"

View file

@ -17,14 +17,11 @@ if sys.version_info <= (3, 9, 0):
Path.readlink = lambda p: Path(os.readlink(str(p)))
def sh(global_config, cmd: List[str], /, env: Optional[dict] = None):
shell = (
(global_config or {})
.get("cram", {})
.get("task", {})
.get("apply", {})
.get("shell", SHELL)
)
def sh(global_config,
cmd: List[str], /,
env: Optional[dict] = None):
shell = (global_config or {}).get("cram", {}).get("task", {}).get("apply", {}).get("shell", SHELL)
prefix = []
if env:
@ -96,19 +93,20 @@ class Package(object):
def expandvars(s: str) -> str:
def _repl(m: re.Match) -> str:
var = m.group(0).lower()
if var == "${hostname}":
match var:
case "${hostname}":
return os.uname()[1].split(".")[0]
elif var == "${fqdn}":
case "${fqdn}":
return os.uname()[1]
elif var == "${home}":
case "${home}":
return os.path.expanduser("~")
elif var == "${uname}" | "${sysname}":
case "${uname}" | "${sysname}":
return platform.system().lower()
elif var == "${arch}":
case "${arch}":
return platform.machine()
elif var == "${release}":
case "${release}":
return platform.release()
else:
case _:
return os.path.expandvars(m.group(0))
s = re.sub(r"\${?([^\s}]+)}?", "${\\1}", s)