Fix basic SSH commands

justinjfu · Jan 17, 2020 · 1552707 · 1552707
1 parent 96a2570
commit 1552707
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/doodad/credentials/ssh.py b/doodad/credentials/ssh.py
@@ -36,8 +36,17 @@ def get_ssh_bash_cmd(self, cmd):
         return prefix + " '%s'"%cmd
 
     def get_ssh_script_cmd(self, script_name, shell_interpreter='bash'):
-        cmd = self.get_ssh_cmd_prefix()
-        cmd += "'%s -s' < %s" % (shell_interpreter, script_name)
+        # The following does not work with archive scripts
+        # cmd = self.get_ssh_cmd_prefix()
+        # cmd += "'%s -s' < %s" % (shell_interpreter, script_name)
+        cmd = "{scp_cmd};" + \
+              "{ssh_cmd}'{shell_interpreter} ./tmp_script.sh';" + \
+              "{ssh_cmd}'rm ./tmp_script.sh'" 
+        cmd = cmd.format(
+            scp_cmd=self.get_scp_cmd(script_name, './tmp_script.sh', src_remote=False),
+            ssh_cmd=self.get_ssh_cmd_prefix(),
+            shell_interpreter=shell_interpreter
+        )
         return cmd
 
     def get_scp_cmd(self, source, destination, src_remote=True, recursive=True):

diff --git a/doodad/mode.py b/doodad/mode.py
@@ -41,12 +41,15 @@ def run_script(self, script_filename, dry=False, return_output=False, verbose=Fa
             verbose (bool): Verbose mode
             return_output (bool): If True, returns stdout from the script as a string.
         """
+        run_cmd = self._get_run_command(script_filename)
+        if verbose:
+            print('Executing command:', run_cmd)
         if return_output:
-            output = shell.call_and_get_output(self._get_run_command(script_filename), shell=True, dry=dry)
+            output = shell.call_and_get_output(run_cmd, shell=True, dry=dry)
             if output:
                 return output.decode('utf-8')
         else:
-            shell.call(self._get_run_command(script_filename), shell=True, dry=dry, wait=not self.async_run)
+            shell.call(run_cmd, shell=True, dry=dry, wait=not self.async_run)
 
     def _get_run_command(self, script_filename):
         raise NotImplementedError()

diff --git a/doodad/test_mode.py b/doodad/test_mode.py
@@ -23,6 +23,6 @@ def test_mode(self):
         launcher = mode.SSHMode(credentials, shell_interpreter='bashy')
         self.assertEqual(
             launcher._get_run_command('myscript.sh'),
-            'ssh [email protected] \'bashy -s\' < myscript.sh'
+            "scp -r myscript.sh [email protected]:./tmp_script.sh;ssh [email protected] 'bashy ./tmp_script.sh';ssh [email protected] 'rm ./tmp_script.sh'"
         )