chore: added a mechanism to have specific syntax per OS on custom logic

Signed-off-by: Adrian Riobo Lorenzo <[email protected]>

Containerfile

@@ -4,6 +4,6 @@ LABEL org.opencontainers.image.authors="Adrian Riobo <[email protected]>"
 
 RUN microdnf install -y openssh-clients sshpass zip jq
 
-COPY lib/* entrypoint.sh /usr/local/bin/
+COPY lib/common/* lib/os/ entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["entrypoint.sh"]

Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.0.5
+VERSION ?= 0.0.6
 CONTAINER_MANAGER ?= podman
 IMG ?= quay.io/rhqp/deliverest:v${VERSION}
 

entrypoint.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Import libs
-source remote.sh
+source /usr/local/bin/remote.sh
+source /usr/local/bin/${OS}/os.sh
 
 # Default values
 TARGET_CLEANUP="${TARGET_CLEANUP:-"true"}"
@@ -57,5 +58,7 @@ if [[ ! -z "${TARGET_RESULTS+x}" ]]; then
 fi
 
 if [ "${TARGET_CLEANUP:-}" = "true" ]; then
-    $(ssh_cmd "rm -r ${TARGET_FOLDER}")
+    # This will create the cmd based on OS env with the right syntax
+    cmd="$(remove_folder ${TARGET_FOLDER})"
+    $(ssh_cmd ${cmd})
 fi

lib/os/darwin/os.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This lib includes common functions with specific syntax for darwin
+
+# #1 folder name to be removed
+remove_folder () {
+    echo "rm -r ${1}"
+}

lib/os/linux/os.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This lib includes common functions with specific syntax for linux
+
+# #1 folder name to be removed
+remove_folder () {
+    echo "rm -r ${1}"
+}

lib/os/os

@@ -0,0 +1,4 @@
+# This file represents the interface os should comply with
+
+# This will return syntax remove a folder 
+remove_folder($1 folder name) string 

lib/os/windows/os.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# This lib includes common functions with specific syntax for windows
+
+# #1 folder name to be removed
+remove_folder () {
+    echo "Remove-Item \"${1}\" -Recurse -Force"
+}
+