ginkgo-tools-batchssh 0.1.0__tar.gz → 0.1.1__tar.gz

{ginkgo_tools_batchssh-0.1.0 → ginkgo_tools_batchssh-0.1.1}/PKG-INFO

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

{ginkgo_tools_batchssh-0.1.0 → ginkgo_tools_batchssh-0.1.1}/ginkgo_tools_batchssh/module_SSHwrapper.py

@@ -515,7 +515,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 +535,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 = os.path.join(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 → ginkgo_tools_batchssh-0.1.1}/ginkgo_tools_batchssh.egg-info/PKG-INFO

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

{ginkgo_tools_batchssh-0.1.0 → ginkgo_tools_batchssh-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ginkgo-tools-batchssh"
-version = "0.1.0"
+version = "0.1.1"
 description = "批量SSH操作和文件传输工具包"
 readme = "README.md"
 authors = [
@@ -34,4 +34,3 @@ dependencies = [
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["ginkgo_tools_batchssh*"]
-exclude = ["batch_record*", "dist*", "__pycache__*", ".venv*", ".idea*"]