Template will only be generated, if targetDir and currentDir have different strings

Author: denise-khuu

localBuildTest.ps1

@@ -1,7 +1,3 @@
 tsc
-Copy-Item -Force -Recurse -Path $PSScriptRoot\engine\parser.def -Destination $PSScriptRoot\build\engine\parser.def
-Copy-Item -Force -Recurse -Path $PSScriptRoot\..\tutorials -Destination $PSScriptRoot\build\playbooks
-Copy-Item -Force -Recurse -Path $PSScriptRoot\environments\ -Destination $PSScriptRoot\build
-Copy-Item -Force -Recurse -Path $PSScriptRoot\runners\ -Destination $PSScriptRoot\build
 npm test
-if(-not $?) { throw 'tests failed' } 
+if(-not $?){ throw 'tests failed' } 

localBuildTest.sh

@@ -1,6 +1,2 @@
 tsc
-cp engine/parser.def build/engine/parser.def
-cp -r ../tutorials build/playbooks
-cp -r environments build
-cp -r runners build
 npm test

runners/katacoda/dirUtils.ts

@@ -1,48 +1,48 @@
-import { captureRejectionSymbol } from "events";
 import * as path from 'path';
 
 export class DirUtils{
 
-    getCdParam(currentDir:string, dir:string):string{
-
+    getCdParam(currentDir:string, targetDir:string):string{
+        
+        //returns an empty string, if both variables have the same path 
+        if(currentDir == targetDir){
+            return "";
+        }
+             
         let dirPath = "";
 
         let currentPaths = currentDir.split(path.sep);
-        let dirPaths = dir.split(path.sep);
+        let targetPaths = targetDir.split(path.sep);
 
         let index;
         let isEqual = true;
-
-        //returns an empty string, if both variables have the same path 
-        if(currentDir == dir){
-            return "";
-        }
 
-        //saves the remaining path, if currentdir is the prefix of dir
-        if(dir.substring(0,currentDir.length) == currentDir){
-            return path.join(dir.replace(currentDir + path.sep, ''));
+        //saves the remaining path, if currentdir is the prefix of targetDir
+        if(targetDir.substring(0,currentDir.length) == currentDir){
+            return path.join(targetDir.replace(currentDir + path.sep, ''));
         }
 
+
         else{
             //returns the absolut directory, if the first parent folder is different
-            if(currentPaths[1] != dirPaths[1]){
-                return dir;
+            if(currentPaths[1] != targetPaths[1]){
+                return targetDir;
             }
 
             //iterates throught currentPath array to compare parent directories
             currentPaths.forEach((currentPath, i) => {
-                if(currentPath == dirPaths[i] && isEqual == true){
+                if(currentPath == targetPaths[i] && isEqual == true){
                     index = i;
                 }else{
                     isEqual = false;
                     dirPath = path.join(dirPath,'..');
                 }
             })
 
-            //slice dirPaths to get the relative path
-            dirPaths = dirPaths.slice(index + 1, dirPaths.length);
+            //slice targetPaths to get the relative path
+            targetPaths = targetPaths.slice(index + 1, targetPaths.length);
 
-            return path.join(dirPath, dirPaths.join(path.sep));
+            return path.join(dirPath, targetPaths.join(path.sep));
 
         }
 

runners/katacoda/index.ts

@@ -123,9 +123,6 @@ export class Katacoda extends Runner {
 
     runCreateProject(step: Step, command:Command): RunResult {
 
-        let params = command.parameters; 
-        let language = params[0];
-        let name = params[1]; 
 
         // generate template to change directory, if the current directory is not equal to the required start directory
        let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw"));
@@ -136,9 +133,9 @@ export class Katacoda extends Runner {
        });
 
         //update current directory
-       this.currentDir = path.join(this.currentDir, "workspace", "main", name); 
+       this.currentDir = path.join(this.currentDir, "workspace", "main", command.parameters[1]); 
 
-       this.renderTemplate("createProject.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter, cdCommand: cdCommand, language: language, name : name});
+       this.renderTemplate("createProject.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter, cdCommand: cdCommand, language: command.parameters[0], name : command.parameters[1]});
        return null; 
     }
 
@@ -159,14 +156,18 @@ export class Katacoda extends Runner {
         this.assetManager.registerFile(setupFile, "setup/setup.txt", "/root/setup", false);
     }
 
-    private changeCurrentDir(dir:string):string{
+    private changeCurrentDir(targetDir:string):string{
+        if(this.currentDir == targetDir){
+            return "";
+        }
         let dirUtils = new DirUtils();
-        let dirPath = dirUtils.getCdParam(this.currentDir, dir);
-        this.currentDir = dir; 
+        let dir = dirUtils.getCdParam(this.currentDir, targetDir);
+
+        this.currentDir = targetDir; 
 
         //create template to change directory 
         let template = fs.readFileSync(path.join(this.getRunnerDirectory(),"templates", 'cd.md'), 'utf8');
-        return ejs.render(template, {dirPath: dirPath}); 
+        return ejs.render(template, {dir: dir}); 
     }
 
 

runners/katacoda/templates/cd.md

@@ -1,4 +1,4 @@
 
-Please change the folder to <%= dirPath; %>
+Please change the folder to <%= dir; %>
 
-`cd <%= dirPath; %>`{{execute}}
+`cd <%= dir; %>`{{execute}}