refac(back): fluidattacks#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 <[email protected]>
dsalaza4 · Dec 5, 2023 · dda5da5 · dda5da5
1 parent 946c7ae
commit dda5da5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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}"