From dda5da5709a7c31574a9d433e60d70165f149093 Mon Sep 17 00:00:00 2001 From: Daniel Salazar Date: Tue, 5 Dec 2023 13:08:29 -0500 Subject: [PATCH] refac(back): #1200 remove prefix - Keep using basename in order to avoid errors - Remove prefix dot if basename contains it - get package_name the old way Signed-off-by: Daniel Salazar --- src/args/lint-python/builder.sh | 2 +- src/args/project-path/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/args/lint-python/builder.sh b/src/args/lint-python/builder.sh index 65e3678c..3bf7388a 100644 --- a/src/args/lint-python/builder.sh +++ b/src/args/lint-python/builder.sh @@ -12,7 +12,7 @@ function main { local python_dirs local python_dir - package_name="$(basename "${envSrc##*-}")" \ + package_name="$(basename "${envSrc#*-}")" \ && info Running mypy over: "${package_path}", package "${package_name}" \ && if ! test -e "${package_path}/py.typed"; then error This is not a mypy package, py.typed missing diff --git a/src/args/project-path/default.nix b/src/args/project-path/default.nix index 9f9ecc62..7c57679b 100644 --- a/src/args/project-path/default.nix +++ b/src/args/project-path/default.nix @@ -1,6 +1,7 @@ { hasPrefix, projectSrc, + removePrefix, ... }: rel: if hasPrefix "/" rel @@ -13,7 +14,7 @@ then name = if rel == "/" then "src" - else builtins.replaceStrings ["/"] ["-"] rel; + else removePrefix "." (builtins.baseNameOf rel); path = (builtins.unsafeDiscardStringContext projectSrc) + rel; }) else abort "projectPath arguments must start with: /, currently it is: ${rel}"