ginkgo-tools-batchssh 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

ginkgo_tools_batchssh/module_SSHwrapper.py

@@ -10,6 +10,7 @@ from typing import Optional
 from . import module_logger
 import os
 import stat
+from pathlib import PurePosixPath, Path
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -515,7 +516,7 @@ class SSHWrapper:
             logger.warning(f"命令封装执行前流程，shell操作文件封装失败，未提供命令列表或命令字符串")
         return response_dict
 
-    def commands_to_shell_run(self, trans_result: dict, sudo_to_user = False, timeout: int = 30) -> dict:
+    def commands_to_shell_run(self, trans_result: dict, sudo_to_user = False, timeout: int = 30 , transfer_directory:str = "") -> dict:
         """
         运行已传输的shell文件
         
@@ -535,9 +536,17 @@ class SSHWrapper:
         if sudo_to_user:
             logger.debug(f"命令封装执行前流程，触发sudo切换执行操作")
             # 执行转移和变更操作
-            sudoers_shell_path = f"/home/{sudo_to_user}/{file_name}"
+            if transfer_directory:
+                sudoers_shell_path = PurePosixPath(transfer_directory, file_name)
+                logger.debug(f"命令封装执行前流程，触发sudo切换执行操作，指定转移目录为：{transfer_directory}")
+            else:
+                if sudo_to_user == "root":sudoers_shell_path = f"/root/{file_name}"
+                else:sudoers_shell_path = f"/home/{sudo_to_user}/{file_name}"
+                logger.debug(f"命令封装执行前流程，触发sudo切换执行操作，未指定转移目录，使用账户关联目录：{sudoers_shell_path}")
+
             logger.info(f"命令封装执行后流程，开始将shell文件{shell_path}转移至用户{sudo_to_user}，目标路径为：{sudoers_shell_path}")
             mv_result = self.execute_command(f'sudo su - root -c "chown {sudo_to_user} {shell_path};mv {shell_path} {sudoers_shell_path}"')
+            logger.debug(mv_result)
             if not mv_result["result"]:
                 logger.warning(f"命令封装执行后流程，将shell文件{shell_path}转移至用户{sudo_to_user}失败，请检查反馈异常为：{mv_result['stderr']}")
                 return mv_result

{ginkgo_tools_batchssh-0.1.0.dist-info → ginkgo_tools_batchssh-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ginkgo-tools-batchssh
-Version: 0.1.0
+Version: 0.1.2
 Summary: 批量SSH操作和文件传输工具包
 Author-email: 霍城 <495466557@qq.com>
 Maintainer-email: 霍城 <495466557@qq.com>

ginkgo_tools_batchssh-0.1.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+ginkgo_tools_batchssh/__init__.py,sha256=S01AOuZJzGcIWh9XU_KL1xqHGh-xgmX44Rus8HwHGW4,1126
+ginkgo_tools_batchssh/moduel_convenient_tools.py,sha256=srhVAx43J8gl9RVK3ZYWolJ6HgPEi0claxgPZwRu-zU,1653
+ginkgo_tools_batchssh/module_SSHwrapper.py,sha256=SWXbt8sQu2fEBPJFT2XRNlT84b_gO4-MOpe9SG0kkk4,36237
+ginkgo_tools_batchssh/module_logger.py,sha256=SFnxCKgyFZmzUl3Tr7nMrNdEkiotjU2cN0oCTZEgWuo,2039
+ginkgo_tools_batchssh-0.1.2.dist-info/METADATA,sha256=MTkzovHDu6GipqFgVoSGBy2xtE3sQYIVMx7wGjrBpM4,5938
+ginkgo_tools_batchssh-0.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ginkgo_tools_batchssh-0.1.2.dist-info/top_level.txt,sha256=LRf7tgGqGRB41Cit0RPETr5gjljt8IS2k5bl2SEPKxY,22
+ginkgo_tools_batchssh-0.1.2.dist-info/RECORD,,

ginkgo_tools_batchssh-0.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-ginkgo_tools_batchssh/__init__.py,sha256=S01AOuZJzGcIWh9XU_KL1xqHGh-xgmX44Rus8HwHGW4,1126
-ginkgo_tools_batchssh/moduel_convenient_tools.py,sha256=srhVAx43J8gl9RVK3ZYWolJ6HgPEi0claxgPZwRu-zU,1653
-ginkgo_tools_batchssh/module_SSHwrapper.py,sha256=-yJe7X7iKIyjsoAdowUoiGDNCtOn1z6ISXlrBgYb4ho,35597
-ginkgo_tools_batchssh/module_logger.py,sha256=SFnxCKgyFZmzUl3Tr7nMrNdEkiotjU2cN0oCTZEgWuo,2039
-ginkgo_tools_batchssh-0.1.0.dist-info/METADATA,sha256=MV52rpktac3X7vBpnZ35ex9lrIYOEaxe4ZpGdPEWO1Q,5938
-ginkgo_tools_batchssh-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ginkgo_tools_batchssh-0.1.0.dist-info/top_level.txt,sha256=LRf7tgGqGRB41Cit0RPETr5gjljt8IS2k5bl2SEPKxY,22
-ginkgo_tools_batchssh-0.1.0.dist-info/RECORD,,