Merge pull request fluidattacks#1120 from este6an13/main

fix(build): fluidattacks#1002 args manage ports fix

.mailmap

@@ -6,6 +6,8 @@ Daniel Salazar <[email protected]> Daniel Salazar <[email protected]>
 David Acevedo <[email protected]> David Acevedo <[email protected]>
 David Arnold <[email protected]> David Arnold <[email protected]>
 David Arnold <[email protected]> David Arnold <[email protected]>
+Diego Quintero <[email protected]> Diego Quintero <[email protected]>
+Diego Quintero <[email protected]> este6an13 <[email protected]>
 Diego Restrepo <[email protected]> Diego Restrepo Mesa <[email protected]>
 Diego Restrepo <[email protected]> Diego Restrepo <[email protected]>
 Diego Restrepo <[email protected]> Diego Restrepo Mesa <[email protected]>

src/args/make-template/default.nix

@@ -25,7 +25,7 @@
       then
         abort ''
 
-          Ivalid placeholder: ${k}
+          Invalid placeholder: ${k}
           Placeholders must match: ${argumentRegex}
           For example: __argExample123__
 

src/args/manage-ports/default.nix

@@ -1,9 +1,13 @@
 {
   __nixpkgs__,
   makeTemplate,
+  __shellCommands__,
   ...
 }:
 makeTemplate {
+  replace = {
+    __argShellCommands__ = __shellCommands__;
+  };
   name = "manage-ports";
   searchPaths = {
     bin = [

src/args/manage-ports/template.sh

@@ -1,23 +1,25 @@
 # shellcheck shell=bash
 
+source __argShellCommands__
+
 function _kill_port {
   local pids
   local port="${1}"
 
   pids="$(mktemp)" \
     && if ! lsof -t "-i:${port}" > "${pids}"; then
-      info "Nothing listening on port: ${port}" \
+      info "No process was found listening on port ${port}" \
         && return 0
     fi \
     && while read -r pid; do
       if kill -9 "${pid}"; then
         if timeout 5 tail --pid="${pid}" -f /dev/null; then
-          info "Killed pid: ${pid}, listening on port: ${port}"
+          info "Process listening on port ${port} with PID ${pid} was successfully killed"
         else
-          warn "kill timeout pid: ${pid}, listening on port: ${port}"
+          warn "Timeout while attempting to kill process with PID ${pid} listening on port ${port}"
         fi
       else
-        error "Unable to kill pid: ${pid}, listening on port: ${port}"
+        error "Unable to kill process with PID ${pid} listening on port ${port}"
       fi
     done < "${pids}"
 }
@@ -50,7 +52,7 @@ function wait_for_tcp {
       error "Timeout while waiting for ${host}:${port} to open" \
         && return 1
     else
-      info "Waiting 1 second for ${host}:${port} to open, ${elapsed} seconds in total" \
+      info "Waiting 1 second for ${host}:${port} to open: ${elapsed} seconds in total" \
         && sleep 1 \
         && elapsed="$(("${elapsed}" + 1))" \
         && continue