Fix commandversion being a string when its a number (#308)

wpilibsuite · Nov 23, 2019 · 844d687 · 844d687
1 parent f6e94e0
commit 844d687
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/vscode-wpilib/src/shared/examples.ts b/vscode-wpilib/src/shared/examples.ts
@@ -14,7 +14,7 @@ export interface IExampleJsonLayout {
   tags: string[];
   foldername: string;
   gradlebase: string;
-  commandversion: string;
+  commandversion: number;
 }
 
 export class Examples {
@@ -45,13 +45,14 @@ export class Examples {
             try {
               if (java) {
                 if (!await generateCopyJava(resourceRoot, path.join(examplesFolder, e.foldername),
-                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, 'frc.robot.Main', path.join('frc', 'robot'), false, e.commandversion !== '2')) {
+                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, 'frc.robot.Main', path.join('frc', 'robot'),
+                  false, e.commandversion !== 2)) {
                   vscode.window.showErrorMessage(i18n('message', 'Cannot create into non empty folder'));
                   return false;
                 }
               } else {
                 if (!await generateCopyCpp(resourceRoot, path.join(examplesFolder, e.foldername),
-                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, false, false, e.commandversion !== '2')) {
+                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, false, false, e.commandversion !== 2)) {
                   vscode.window.showErrorMessage(i18n('message', 'Cannot create into non empty folder'));
                   return false;
                 }

diff --git a/vscode-wpilib/src/shared/templates.ts b/vscode-wpilib/src/shared/templates.ts
@@ -14,7 +14,7 @@ export interface ITemplateJsonLayout {
   tags: string[];
   foldername: string;
   gradlebase: string;
-  commandversion: string;
+  commandversion: number;
 }
 
 export class Templates {
@@ -45,13 +45,14 @@ export class Templates {
             try {
               if (java) {
                 if (!await generateCopyJava(resourceRoot, path.join(templatesFolder, e.foldername),
-                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, 'frc.robot.Main', path.join('frc', 'robot'), false, e.commandversion !== '2')) {
+                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, 'frc.robot.Main', path.join('frc', 'robot'),
+                  false, e.commandversion !== 2)) {
                   vscode.window.showErrorMessage(i18n('message', 'Cannot create into non empty folder'));
                   return false;
                 }
               } else {
                 if (!await generateCopyCpp(resourceRoot, path.join(templatesFolder, e.foldername),
-                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, false, false, e.commandversion !== '2')) {
+                  path.join(gradleBasePath, e.gradlebase), folderInto.fsPath, false, false, e.commandversion !== 2)) {
                   vscode.window.showErrorMessage(i18n('message', 'Cannot create into non empty folder'));
                   return false;
                 }