Эх сурвалжийг харах

Merge pull request #56 from solana-program/febo/fix-args-parsing

Fix command-line args parsing on scripts
Fernando Otero 1 жил өмнө
parent
commit
36269edf37

+ 5 - 0
.changeset/nasty-timers-lay.md

@@ -0,0 +1,5 @@
+---
+"create-solana-program": patch
+---
+
+Fix command-line args parsing on scripts

+ 1 - 1
template/base/scripts/program/build.mjs

@@ -9,6 +9,6 @@ import './dump.mjs';
 await Promise.all(
   getProgramFolders().map(async (folder) => {
     await $`cd ${path.join(workingDirectory, folder)}`.quiet();
-    await $`cargo-build-sbf ${argv._}`;
+    await $`cargo-build-sbf ${process.argv.slice(3)}`;
   })
 );

+ 1 - 1
template/base/scripts/program/format.mjs

@@ -6,6 +6,6 @@ import { workingDirectory, getProgramFolders } from '../utils.mjs';
 await Promise.all(
   getProgramFolders().map(async (folder) => {
     await $`cd ${path.join(workingDirectory, folder)}`.quiet();
-    await $`cargo fmt ${argv._}`;
+    await $`cargo fmt ${process.argv.slice(3)}`;
   })
 );

+ 1 - 1
template/base/scripts/program/lint.mjs

@@ -6,6 +6,6 @@ import { workingDirectory, getProgramFolders } from '../utils.mjs';
 await Promise.all(
   getProgramFolders().map(async (folder) => {
     await $`cd ${path.join(workingDirectory, folder)}`.quiet();
-    await $`cargo clippy ${argv._}`;
+    await $`cargo clippy ${process.argv.slice(3)}`;
   })
 );

+ 2 - 2
template/base/scripts/program/test.mjs

@@ -12,9 +12,9 @@ await Promise.all(
     const hasSolfmt = await which('solfmt', { nothrow: true });
 
     if (hasSolfmt) {
-      await $`RUST_LOG=error cargo test-sbf ${argv._} 2>&1 | solfmt`;
+      await $`RUST_LOG=error cargo test-sbf ${process.argv.slice(3)} 2>&1 | solfmt`;
     } else {
-      await $`RUST_LOG=error cargo test-sbf ${argv._}`;
+      await $`RUST_LOG=error cargo test-sbf ${process.argv.slice(3)}`;
     }
   })
 );

+ 1 - 1
template/clients/js/scripts/client/test-js.mjs

@@ -9,4 +9,4 @@ await $`pnpm validator:restart`;
 cd(path.join(workingDirectory, 'clients', 'js'));
 await $`pnpm install`;
 await $`pnpm build`;
-await $`pnpm test ${argv._}`;
+await $`pnpm test ${process.argv.slice(3)}`;

+ 1 - 1
template/clients/rust/scripts/client/lint-rust.mjs

@@ -4,4 +4,4 @@ import { workingDirectory } from '../utils.mjs';
 
 // Check the client using Clippy.
 cd(path.join(workingDirectory, 'clients', 'rust'));
-await $`cargo clippy ${argv._}`;
+await $`cargo clippy ${process.argv.slice(3)}`;

+ 2 - 2
template/clients/rust/scripts/client/test-rust.mjs

@@ -6,7 +6,7 @@ import { workingDirectory } from '../utils.mjs';
 cd(path.join(workingDirectory, 'clients', 'rust'));
 const hasSolfmt = await which('solfmt', { nothrow: true });
 if (hasSolfmt) {
-  await $`cargo test-sbf ${argv._} 2>&1 | solfmt`;
+  await $`cargo test-sbf ${process.argv.slice(3)} 2>&1 | solfmt`;
 } else {
-  await $`cargo test-sbf ${argv._}`;
+  await $`cargo test-sbf ${process.argv.slice(3)}`;
 }