From 84c3d53564b3604334f292c42ab5083141b380a2 Mon Sep 17 00:00:00 2001 From: Maxim Podvarkov Date: Tue, 26 Feb 2019 11:48:15 +0500 Subject: [PATCH 1/2] Fix mv -T Remove -T option --- packages/shipit-deploy/src/tasks/deploy/publish.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shipit-deploy/src/tasks/deploy/publish.js b/packages/shipit-deploy/src/tasks/deploy/publish.js index d336b7c..8cb41cf 100644 --- a/packages/shipit-deploy/src/tasks/deploy/publish.js +++ b/packages/shipit-deploy/src/tasks/deploy/publish.js @@ -26,7 +26,7 @@ const publishTask = shipit => { 'ln -nfs ' + relativeReleasePath + ' current_tmp && ' + - 'mv -fT current_tmp current; ' + + 'mv -f current_tmp current; ' + 'fi', ) /* eslint-enable prefer-template */ From 3e65c442026c0d0a4c658b0de63bbc10c92cf2b5 Mon Sep 17 00:00:00 2001 From: Maksim Podvarkov Date: Tue, 26 Feb 2019 13:44:48 +0500 Subject: [PATCH 2/2] tests: try to pass tests after -T option removed --- packages/shipit-deploy/src/tasks/deploy/publish.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shipit-deploy/src/tasks/deploy/publish.test.js b/packages/shipit-deploy/src/tasks/deploy/publish.test.js index 4302f57..a7c0b67 100644 --- a/packages/shipit-deploy/src/tasks/deploy/publish.test.js +++ b/packages/shipit-deploy/src/tasks/deploy/publish.test.js @@ -33,7 +33,7 @@ describe('deploy:publish task', () => { await start(shipit, 'deploy:publish') expect(shipit.currentPath).toBe('/remote/deploy/current') expect(shipit.remote).toBeCalledWith( - 'cd /remote/deploy && if [ -d current ] && [ ! -L current ]; then echo "ERR: could not make symlink"; else ln -nfs releases/20141704123138 current_tmp && mv -fT current_tmp current; fi', + 'cd /remote/deploy && if [ -d current ] && [ ! -L current ]; then echo "ERR: could not make symlink"; else ln -nfs releases/20141704123138 current_tmp && mv -f current_tmp current; fi', ) }) })