From 2f59137d10520d0461c612b351c2cad52b2ef2b7 Mon Sep 17 00:00:00 2001 From: vapao Date: Wed, 5 Feb 2020 14:26:15 +0800 Subject: [PATCH] =?UTF-8?q?F=20=E4=BF=AE=E5=A4=8DmacOS=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/deploy/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index 3d4e5d5..183cbd1 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -10,6 +10,7 @@ import socket import subprocess import json import uuid +import sys import os REPOS_DIR = settings.REPOS_DIR @@ -149,7 +150,11 @@ def _deploy_ext1_host(helper, h_id, extend, env): # do deploy helper.send_step(h_id, 3, f'{human_time()} 执行发布... ') tmp_path = os.path.join(extend.dst_repo, f'tmp_{env.SPUG_VERSION}') - helper.remote(host.id, ssh, f'ln -sfn {repo_dir} {tmp_path} && mv -fT {tmp_path} {extend.dst_dir}') + if sys.platform == 'darwin': + command = f'rm -f {extend.dst_dir} && ln -sfn {repo_dir} {extend.dst_dir}' + else: + command = f'ln -sfn {repo_dir} {tmp_path} && mv -fT {tmp_path} {extend.dst_dir}' + helper.remote(host.id, ssh, command) helper.send_step(h_id, 3, '完成\r\n') # post host