From 9d8adf1691e65ad463472cf3d32603fa3be8cb2d Mon Sep 17 00:00:00 2001 From: Nurbakhyt Date: Wed, 5 Apr 2023 05:22:22 +0500 Subject: [PATCH 1/3] Fix script for Windows Signed-off-by: Nurbakhyt --- build_tools/rename_zip.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build_tools/rename_zip.js b/build_tools/rename_zip.js index 65da9c06e..d212e7af3 100644 --- a/build_tools/rename_zip.js +++ b/build_tools/rename_zip.js @@ -23,4 +23,13 @@ const oldName = `build/${osdJson.id}-${osdJson.opensearchDashboardsVersion}.zip` const newName = `build/${pluginName}-${packageJson.version}.zip`; console.log('rename ' + oldName + ' to ' + newName); -shell(`mv ${oldName} ${newName}`); +const os = require('os') + +if(os.type() == 'Windows_NT'){ + const fs = require('fs'); + fs.renameSync(oldName, newName); +}else{ + shell(`mv ${oldName} ${newName}`); +} + + From 6d36c7f204ec326b6d69b3becf3fcc651593dcfc Mon Sep 17 00:00:00 2001 From: nurbqq Date: Wed, 5 Apr 2023 16:47:44 +0500 Subject: [PATCH 2/3] Remove os check Signed-off-by: nurbqq --- build_tools/rename_zip.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build_tools/rename_zip.js b/build_tools/rename_zip.js index d212e7af3..2a2fa9542 100644 --- a/build_tools/rename_zip.js +++ b/build_tools/rename_zip.js @@ -23,13 +23,9 @@ const oldName = `build/${osdJson.id}-${osdJson.opensearchDashboardsVersion}.zip` const newName = `build/${pluginName}-${packageJson.version}.zip`; console.log('rename ' + oldName + ' to ' + newName); -const os = require('os') - -if(os.type() == 'Windows_NT'){ - const fs = require('fs'); - fs.renameSync(oldName, newName); -}else{ - shell(`mv ${oldName} ${newName}`); -} + + +const fs = require('fs'); +fs.renameSync(oldName, newName); From 79776fc7f86bcde93077722fe00022aa6fbe3eac Mon Sep 17 00:00:00 2001 From: nurbqq Date: Wed, 5 Apr 2023 22:37:09 +0500 Subject: [PATCH 3/3] Fix issues Signed-off-by: nurbqq --- build_tools/rename_zip.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build_tools/rename_zip.js b/build_tools/rename_zip.js index 2a2fa9542..c14eb0745 100644 --- a/build_tools/rename_zip.js +++ b/build_tools/rename_zip.js @@ -13,8 +13,6 @@ * permissions and limitations under the License. */ -const shell = require('child_process').execSync; - const packageJson = require('../package.json'); const osdJson = require('../opensearch_dashboards.json'); const pluginName = 'security-dashboards'; @@ -24,8 +22,5 @@ const newName = `build/${pluginName}-${packageJson.version}.zip`; console.log('rename ' + oldName + ' to ' + newName); - const fs = require('fs'); fs.renameSync(oldName, newName); - -