Compare commits
No commits in common. "282e2ac7a1490bcdf748d6c66580c555f584bc0b" and "a5ca3a60440d740a4d6b67e255c2d6c777a027c0" have entirely different histories.
282e2ac7a1
...
a5ca3a6044
9 changed files with 22 additions and 56 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,5 +1,4 @@
|
|||
__pycache__
|
||||
/tmp
|
||||
/.venv
|
||||
/.vscode
|
||||
/dist
|
||||
|
|
|
@ -32,8 +32,4 @@ requires-python = ">= 3.10"
|
|||
path = "rwx/__init__.py"
|
||||
|
||||
[tool.ruff]
|
||||
line-length = 80
|
||||
|
||||
[tool.ruff.lint]
|
||||
ignore = ["COM812", "D203", "D213", "ISC001"]
|
||||
select = ["ALL"]
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
"""Read Write eXecute."""
|
||||
|
||||
__version__ = "0.0.1"
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
#! /usr/bin/env python3
|
||||
|
||||
"""Entry point."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
import fs
|
||||
|
||||
if __name__ == "__main__":
|
||||
file_path = Path(__file__).resolve()
|
||||
root_path = file_path.parent
|
||||
|
|
|
@ -6,14 +6,10 @@ rwx.cmd.need("mksquashfs")
|
|||
|
||||
|
||||
def mksquashfs(input_root: str, output_file: str):
|
||||
ps.run(
|
||||
[
|
||||
ps.run([
|
||||
"mksquashfs",
|
||||
input_root,
|
||||
output_file,
|
||||
"-comp",
|
||||
"zstd",
|
||||
"-Xcompression-level",
|
||||
str(18),
|
||||
]
|
||||
)
|
||||
"-comp", "zstd",
|
||||
"-Xcompression-level", str(18),
|
||||
])
|
||||
|
|
|
@ -17,13 +17,8 @@ MODULES = {
|
|||
}
|
||||
|
||||
|
||||
def make_image(
|
||||
image_format: str,
|
||||
image_path: str,
|
||||
modules: list[str],
|
||||
memdisk_path: str,
|
||||
pubkey_path: str | None = None,
|
||||
) -> None:
|
||||
def make_image(image_format: str, image_path: str, modules: list[str],
|
||||
memdisk_path: str, pubkey_path: str | None = None) -> None:
|
||||
args = [
|
||||
("grub-mkimage",),
|
||||
("--compress", COMPRESSION),
|
||||
|
@ -34,6 +29,6 @@ def make_image(
|
|||
if pubkey_path:
|
||||
args.append(("--pubkey", pubkey_path))
|
||||
args.extend(modules)
|
||||
if modules := MODULES.get(image_format):
|
||||
if modules := MODULES.get(image_format, None):
|
||||
args.extend(modules)
|
||||
ps.run(*args)
|
||||
|
|
|
@ -16,17 +16,13 @@ def get_file_logger(name: str) -> logging.Logger:
|
|||
logger.setLevel(logging.INFO)
|
||||
#
|
||||
return logger
|
||||
|
||||
|
||||
def get_stream_logger(level: int) -> logging.Logger:
|
||||
def get_stream_logger() -> logging.Logger:
|
||||
out_handler = logging.StreamHandler(stream=sys.stdout)
|
||||
out_handler.setLevel(level)
|
||||
out_handler.setLevel(logging.INFO)
|
||||
#
|
||||
logger = logging.getLogger()
|
||||
logger.addHandler(out_handler)
|
||||
logger.setLevel(level)
|
||||
logger.setLevel(logging.INFO)
|
||||
#
|
||||
return logger
|
||||
|
||||
|
||||
stream = get_stream_logger(logging.INFO)
|
||||
stream = get_stream_logger()
|
||||
|
|
|
@ -15,18 +15,12 @@ class SphinxProject(Project):
|
|||
wipe(output_root)
|
||||
arguments: list[str] = [
|
||||
"-E",
|
||||
"-j",
|
||||
"2",
|
||||
"-b",
|
||||
"html",
|
||||
"-D",
|
||||
f"project={self.name}",
|
||||
"-D",
|
||||
"master_doc={}".format("index"),
|
||||
"-D",
|
||||
"html_theme={}".format("sphinx_rtd_theme"),
|
||||
"-c",
|
||||
self.root,
|
||||
"-j", "2",
|
||||
"-b", "html",
|
||||
"-D", f"project={self.name}",
|
||||
"-D", "master_doc={}".format("index"),
|
||||
"-D", "html_theme={}".format("sphinx_rtd_theme"),
|
||||
"-c", self.root,
|
||||
# "-C",
|
||||
path.join(self.root, self.name),
|
||||
path.join(output_root, self.name),
|
||||
|
|
|
@ -14,9 +14,7 @@ def get_tuples_args(tuples) -> list[str]:
|
|||
|
||||
|
||||
def run(*tuples) -> subprocess.CompletedProcess:
|
||||
return subprocess.run(
|
||||
get_tuples_args(tuples), capture_output=False, check=True
|
||||
)
|
||||
return subprocess.run(get_tuples_args(tuples), capture_output=False)
|
||||
|
||||
|
||||
def run_line(*tuples, charset: str = txt.CHARSET) -> str:
|
||||
|
@ -25,8 +23,6 @@ def run_line(*tuples, charset: str = txt.CHARSET) -> str:
|
|||
|
||||
|
||||
def run_lines(*tuples, charset: str = txt.CHARSET) -> list[str]:
|
||||
process = subprocess.run(
|
||||
get_tuples_args(tuples), capture_output=True, check=True
|
||||
)
|
||||
process = subprocess.run(get_tuples_args(tuples), capture_output=True)
|
||||
string = process.stdout.decode(charset)
|
||||
return string.rstrip().splitlines()
|
||||
|
|
Loading…
Add table
Reference in a new issue