Fix pre-exec in non-native

- Command should not be wrapped in a shell
- Fix user add error message if ssh key is not present

convoy/batch.py

@@ -4614,8 +4614,7 @@ def _construct_task(
                 )
         # set pre-exec command
         if util.is_not_empty(task.multi_instance.pre_execution_command):
-            commands['preexec'] = [
-                task.multi_instance.pre_execution_command]
+            commands['preexec'] = task.multi_instance.pre_execution_command
         # set application command
         if native:
             if task.multi_instance.mpi is None:
@@ -4628,7 +4627,7 @@ def _construct_task(
                 commands['task'] = [commands['mpi']]
             # insert preexec prior to task command for native
             if util.is_not_empty(commands['preexec']):
-                commands['task'].insert(0, commands['preexec'][0])
+                commands['task'].insert(0, commands['preexec'])
         else:
             commands['task'] = []
             # for non-native do not set the RUNTIME so the user command is
@@ -4777,8 +4776,7 @@ def _construct_task(
             taskenv.append(
                 batchmodels.EnvironmentSetting(
                     name='SHIPYARD_USER_PROLOGUE_CMD',
-                    value=util.wrap_commands_in_shell(
-                        commands['preexec'], windows=is_windows),
+                    value=commands['preexec'],
                 )
             )
         # set user command (task)

convoy/fleet.py

@@ -1841,9 +1841,9 @@ def _add_pool(
         except Exception as e:
             logger.exception(e)
             logger.error(
-                'Could not add SSH users to nodes. Please ensure ssh-keygen '
-                'is available in your PATH or cwd. Skipping data ingress if '
-                'specified.')
+                'Could not add SSH users to nodes. Please ensure the '
+                'specified keyfile exists or ssh-keygen is available in '
+                'your PATH or cwd. Skipping data ingress if specified.')
         else:
             rls = None
             # ingress data to shared fs if specified