diff --git a/src/cli/config/config-export.ts b/src/cli/config/config-export.ts index 822a40f94..947a85f90 100644 --- a/src/cli/config/config-export.ts +++ b/src/cli/config/config-export.ts @@ -41,9 +41,9 @@ export default function setup() { ) .addOption( new Option( - '-x, --extract', - 'Extract scripts and server properties from the exported file, and save it to a separate file. Ignored with -a.' - ) + '-x, --no-extract', + 'Do not extract scripts and server properties from the exported file to a separate file.' + ).default(true, 'true') ) .addOption( new Option( diff --git a/src/cli/node/node-export.ts b/src/cli/node/node-export.ts index ac5dc1f0f..41a2c25d5 100644 --- a/src/cli/node/node-export.ts +++ b/src/cli/node/node-export.ts @@ -47,9 +47,9 @@ export default function setup() { ) .addOption( new Option( - '-x, --extract', - 'Extract the script from the exported file, and save it to a separate file. Ignored with -a.' - ) + '-x, --no-extract', + 'Do not extract the script from the exported file to a separate file.' + ).default(true, 'true') ) .addOption( new Option( diff --git a/src/cli/script/script-export.ts b/src/cli/script/script-export.ts index d77a4bf92..2e9aab5dd 100644 --- a/src/cli/script/script-export.ts +++ b/src/cli/script/script-export.ts @@ -61,9 +61,9 @@ export default function setup() { ) .addOption( new Option( - '-x, --extract', - 'Extract the script from the exported file, and save it to a separate file. Ignored with -a.' - ) + '-x, --no-extract', + 'Do not extract the script from the exported file to a separate file.' + ).default(true, 'true') ) .addOption( new Option( diff --git a/src/cli/server/server-export.ts b/src/cli/server/server-export.ts index ae8598526..583ab4b8d 100644 --- a/src/cli/server/server-export.ts +++ b/src/cli/server/server-export.ts @@ -46,9 +46,9 @@ export default function setup() { ) .addOption( new Option( - '-x, --extract', - 'Extract scripts and server properties from the exported file, and save it to a separate file. Ignored with -a.' - ) + '-x, --no-extract', + 'Do not extract the server properties from the exported file to a separate file.' + ).default(true, 'true') ) .addOption( new Option( @@ -101,7 +101,7 @@ export default function setup() { verboseMessage(`Exporting all servers to a single file...`); const outcome = await exportServersToFile( options.file, - options.extract, + false, options.metadata, { includeDefault: options.default, diff --git a/test/client_cli/en/__snapshots__/config-export.test.js.snap b/test/client_cli/en/__snapshots__/config-export.test.js.snap index 647ee250c..0dd08f126 100644 --- a/test/client_cli/en/__snapshots__/config-export.test.js.snap +++ b/test/client_cli/en/__snapshots__/config-export.test.js.snap @@ -65,9 +65,8 @@ Options: source environment. --use-string-arrays Where applicable, use string arrays to store multi-line text (e.g. scripts). (default: off) - -x, --extract Extract scripts and server properties from the - exported file, and save it to a separate file. - Ignored with -a. + -x, --no-extract Do not extract scripts and server properties from + the exported file to a separate file. -h, --help Help -hh, --help-more Help with all options. -hhh, --help-all Help with all options, environment variables, and diff --git a/test/client_cli/en/__snapshots__/node-export.test.js.snap b/test/client_cli/en/__snapshots__/node-export.test.js.snap index 7fda336e3..1b2e19832 100644 --- a/test/client_cli/en/__snapshots__/node-export.test.js.snap +++ b/test/client_cli/en/__snapshots__/node-export.test.js.snap @@ -35,8 +35,8 @@ Options: -N, --no-metadata Does not include metadata in the export file. --use-string-arrays Where applicable, use string arrays to store scripts. (default: off) - -x, --extract Extract the script from the exported file, and - save it to a separate file. Ignored with -a. + -x, --no-extract Do not extract the script from the exported file + to a separate file. -h, --help Help -hh, --help-more Help with all options. -hhh, --help-all Help with all options, environment variables, and diff --git a/test/client_cli/en/__snapshots__/script-export.test.js.snap b/test/client_cli/en/__snapshots__/script-export.test.js.snap index fc0ec5002..f043c881e 100644 --- a/test/client_cli/en/__snapshots__/script-export.test.js.snap +++ b/test/client_cli/en/__snapshots__/script-export.test.js.snap @@ -38,8 +38,8 @@ Options: scripts). Ignored with -a and -A. -s, --script