feat(args): add --pacman-path flag

actionless · Sep 3, 2024 · 770cf3d · 770cf3d
1 parent 49ff187
commit 770cf3d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -208,6 +208,7 @@ Print warning when using privilege escalation tool other than `sudo`.
 
 ##### PacmanPath (default: pacman)
 Path to pacman executable.
+Will be overriden by `--pacman-path` flag.
 
 ##### PreserveEnv (default: `PKGDEST,VISUAL,EDITOR,http_proxy,https_proxy,ftp_proxy,HTTP_PROXY,HTTPS_PROXY,FTP_PROXY,ALL_PROXY`)
 Preserve environment variables of current user when running pikaur as root (comma-separated).

diff --git a/pikaur/args.py b/pikaur/args.py
@@ -268,6 +268,11 @@ def get_pikaur_str_opts(action: str | None = None) -> ArgSchema:
             PikaurConfig().misc.PreserveEnv.get_str(),
             translate("preserve environment variables (comma-separated)"),
         ),
+        (
+            None, "pacman-path",
+            PikaurConfig().misc.PacmanPath.get_str(),
+            translate("override path to pacman executable"),
+        ),
     ]
     if not action:
         for each_action in ALL_ACTIONS:
@@ -459,6 +464,7 @@ class PikaurArgs(Namespace):
     makepkg_config: str | None
     mflags: str | None
     makepkg_path: str | None
+    pacman_path: str
     quiet: bool
     sysupgrade: int
     devel: int

diff --git a/pikaur/help_cli.py b/pikaur/help_cli.py
@@ -9,7 +9,6 @@
     parse_args,
     reconstruct_args,
 )
-from .config import PikaurConfig
 from .i18n import PIKAUR_NAME, translate
 from .pikaprint import print_stdout
 from .spawn import spawn
@@ -41,7 +40,7 @@ def cli_print_help() -> None:
     args = parse_args()
 
     proc = spawn([
-        PikaurConfig().misc.PacmanPath.get_str(),
+        args.pacman_path,
         *reconstruct_args(args, ignore_args=get_pikaur_long_opts()),
     ])
     if not proc.stdout_text:

diff --git a/pikaur/main.py b/pikaur/main.py
@@ -178,7 +178,7 @@ def cli_pkgbuild() -> None:
 def cli_print_version() -> None:
     args = parse_args()
     proc = spawn([
-        PikaurConfig().misc.PacmanPath.get_str(), "--version",
+        args.pacman_path, "--version",
     ])
     pacman_version = proc.stdout_text.splitlines()[1].strip(" .-") if proc.stdout_text else "N/A"
     print_version(
@@ -345,7 +345,7 @@ def cli_entry_point() -> None:
         # Just bypass all the args to pacman
         logger.debug("Pikaur operation not found for args: {}", sys.argv)
         logger.debug(args)
-        pacman_args = [PikaurConfig().misc.PacmanPath.get_str(), *args.raw_without_pikaur_specific]
+        pacman_args = [args.pacman_path, *args.raw_without_pikaur_specific]
         if require_sudo:
             pacman_args = sudo(pacman_args)
         sys.exit(

diff --git a/pikaur/pacman.py b/pikaur/pacman.py
@@ -9,7 +9,6 @@
 
 from .alpm import PyAlpmWrapper
 from .args import PACMAN_APPEND_OPTS, get_pacman_str_opts, parse_args, reconstruct_args
-from .config import PikaurConfig
 from .exceptions import DependencyError, PackagesNotFoundInRepoError
 from .i18n import translate
 from .lock import FancyLock
@@ -59,8 +58,7 @@ def get_pacman_command(  # pylint: disable=too-many-branches
 ) -> list[str]:
     ignore_args = ignore_args or []
     args = parse_args()
-    pacman_path = PikaurConfig().misc.PacmanPath.get_str()
-    pacman_cmd = [pacman_path]
+    pacman_cmd = [args.pacman_path]
     if color_enabled():
         pacman_cmd += ["--color=always"]
     else:

diff --git a/pikaur/pkg_cache_cli.py b/pikaur/pkg_cache_cli.py
@@ -1,5 +1,5 @@
 from .args import parse_args, reconstruct_args
-from .config import DECORATION, BuildCachePath, PackageCachePath, PikaurConfig
+from .config import DECORATION, BuildCachePath, PackageCachePath
 from .exceptions import SysExit
 from .i18n import translate
 from .logging_extras import create_logger
@@ -41,7 +41,7 @@ def clean_repo_cache() -> None:
     if args.noconfirm:
         returncode = pikspect(
             sudo([
-                PikaurConfig().misc.PacmanPath.get_str(),
+                args.pacman_path,
                 *reconstruct_args(args, ignore_args=["noconfirm"]),
             ]),
             extra_questions={YesNo.ANSWER_Y: [
@@ -61,7 +61,7 @@ def clean_repo_cache() -> None:
             returncode = 255
     else:
         returncode = interactive_spawn(sudo([
-            PikaurConfig().misc.PacmanPath.get_str(),
+            args.pacman_path,
             *reconstruct_args(args, ignore_args=["noconfirm"]),
         ])).returncode
     raise SysExit(returncode)