Simplify command script

scripts/pipeline/cloud-gov-remote-command.sh

@@ -1,19 +1,25 @@
 #!/bin/bash
 
+# Ensure the script stops on any error
+set -e
 
-
+# Variables
 APP_NAME=$1
 command=$2
 show_output=$3
 
 APP_GUID=$(cf app "${APP_NAME}" --guid)
 bin_path="/var/www/vendor/bin/:/home/vcap/deps/0/bin/"
 
+# Validate inputs
+if [ -z "${APP_NAME}" ] || [ -z "${command}" ]; then
+  echo "Command error! Valid format: ${0} <application_name> <command>"
+  exit 1
+fi
 
-[ -z "${APP_NAME}" ] || [ -z "${command}" ] && echo "Command error! Valid format: ${0} <application_name> <command>" && exit 1
-
+# Create SSH configuration and password files
 ssh_config=/tmp/ssh_config
-ssh_passwd="/tmp/ssh_password"
+ssh_passwd=/tmp/ssh_password
 
 cat >${ssh_config} <<EOL
 Host ssh.fr.cloud.gov
@@ -26,11 +32,56 @@ EOL
 
 cf ssh-code > ${ssh_passwd}
 
-if [ -z "${show_output}" ]; then
-  echo "Running command: '$(echo "${command}" | cut -d' ' -f1,2)'..."
-  {
-    sshpass -f "${ssh_passwd}" ssh -F "${ssh_config}" "ssh.fr.cloud.gov" "touch ~/.bashrc && source ~/.bashrc && PATH=\$PATH:${bin_path} ${command}"
-  } #> /dev/null 2>&1
-else
-  sshpass -f "${ssh_passwd}" ssh -F "${ssh_config}" "ssh.fr.cloud.gov" "touch ~/.bashrc && source ~/.bashrc && PATH=\$PATH:${bin_path} ${command}"
-fi
+# Debugging: Output command being run
+echo "Running command on remote app: ${command}"
+
+# Execute the commands line by line
+echo "Executing commands from input..."
+while IFS= read -r line || [[ -n "$line" ]]; do
+  echo "Processing command: $line"
+  sshpass -f "${ssh_passwd}" ssh -F "${ssh_config}" "ssh.fr.cloud.gov" \
+    "touch ~/.bashrc && source ~/.bashrc && PATH=\$PATH:${bin_path} $line"
+done <<< "${command}"
+
+# Clean up temporary files
+rm -f ${ssh_config} ${ssh_passwd}
+
+# Debugging: Notify success
+echo "Command execution completed."
+
+# #!/bin/bash
+#
+#
+#
+# APP_NAME=$1
+# command=$2
+# show_output=$3
+#
+# APP_GUID=$(cf app "${APP_NAME}" --guid)
+# bin_path="/var/www/vendor/bin/:/home/vcap/deps/0/bin/"
+#
+#
+# [ -z "${APP_NAME}" ] || [ -z "${command}" ] && echo "Command error! Valid format: ${0} <application_name> <command>" && exit 1
+#
+# ssh_config=/tmp/ssh_config
+# ssh_passwd="/tmp/ssh_password"
+#
+# cat >${ssh_config} <<EOL
+# Host ssh.fr.cloud.gov
+#   Hostname ssh.fr.cloud.gov
+#   Port 2222
+#   User cf:${APP_GUID}/0
+#   StrictHostKeyChecking no
+#   RequestTTY force
+# EOL
+#
+# cf ssh-code > ${ssh_passwd}
+#
+# if [ -z "${show_output}" ]; then
+#   echo "Running command: '$(echo "${command}" | cut -d' ' -f1,2)'..."
+#   {
+#     sshpass -f "${ssh_passwd}" ssh -F "${ssh_config}" "ssh.fr.cloud.gov" "touch ~/.bashrc && source ~/.bashrc && PATH=\$PATH:${bin_path} ${command}"
+#   } #> /dev/null 2>&1
+# else
+#   sshpass -f "${ssh_passwd}" ssh -F "${ssh_config}" "ssh.fr.cloud.gov" "touch ~/.bashrc && source ~/.bashrc && PATH=\$PATH:${bin_path} ${command}"
+# fi