Merge branch 'main' into feature/katacodaDockerCompose

Author: MarcelDiessner

documentation/Functions.md

@@ -19,6 +19,16 @@ installDevonfwIde(["java","mvn"], "2020.08.001")
 
 ***
 
+### restoreDevonfwIde
+#### parameter
+1. The tools you want to install within the devonfw ide: string array
+2. Optional: The version of the ide to install
+#### example
+restoreDevonfwIde(["java","mvn"], "2020.08.001")
+#### details 
+In the Katacoda environment the installation of the devonfw IDE is executed in a startup script.
+***
+
 ### installCobiGen
 #### parameter
 * No parameters
@@ -105,3 +115,4 @@ Please try not to use custom placeholders. Keep in mind that you might want to b
 dockerCompose("exampleproject")
 
 ***
+

runners/console/index.ts

@@ -52,6 +52,11 @@ export class Console extends Runner {
         return result;
     }
 
+
+    runRestoreDevonfwIde(step: Step, command: Command): RunResult {
+        return this.runInstallDevonfwIde(step, command);
+    }
+
     runInstallCobiGen(step: Step, command: Command): RunResult {
         let result = new RunResult();
         result.returnCode = 0;
@@ -158,6 +163,10 @@ export class Console extends Runner {
         }
     }
 
+    async assertRestoreDevonfwIde(step: Step, command: Command, result: RunResult) {
+       this.assertInstallDevonfwIde(step, command, result);
+    }
+
     async assertInstallCobiGen(step: Step, command: Command, result: RunResult) {
         let assert = new Assertions()
         .noErrorCode(result)

runners/katacoda/index.ts

@@ -69,7 +69,6 @@ export class Katacoda extends Runner {
 
     runInstallDevonfwIde(step: Step, command: Command): RunResult {
         let cdCommand = this.changeCurrentDir("/root");     
-
         let tools = command.parameters[0].join(" ").replace(/vscode/,"").replace(/eclipse/, "").trim();
 
         // create script to download devonfw ide settings
@@ -93,6 +92,26 @@ export class Katacoda extends Runner {
         return null;
     }
 
+    runRestoreDevonfwIde(step: Step, command: Command): RunResult {
+        let tools = command.parameters[0].join(" ").replace(/vscode/,"").replace(/eclipse/, "").trim();
+
+        // create script to download devonfw ide settings.
+        this.renderTemplate(path.join("scripts", "cloneDevonfwIdeSettings.sh"), path.join(this.setupDir, "cloneDevonfwIdeSettings.sh"), { tools: tools, cloneDir: "/root/devonfw-settings/"});
+        this.renderTemplate(path.join("scripts", "restoreDevonfwIde.sh"), path.join(this.setupDir, "restoreDevonfwIde.sh"), {});
+
+        // add the script to the setup scripts for executing it at the beginning of the tutorial
+        this.setupScripts.push({
+            "name": "Clone devonfw IDE settings",
+            "script": "cloneDevonfwIdeSettings.sh"
+        });
+        this.setupScripts.push({
+            "name": "Restore Devonfw IDE",
+            "script": "restoreDevonfwIde.sh"
+        });
+
+        return null;
+    }
+
     runInstallCobiGen(step: Step, command: Command): RunResult {
         this.steps.push({
             "title": "Install CobiGen",

runners/katacoda/templates/scripts/restoreDevonfwIde.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+mkdir devonfw
+cd devonfw
+
+mkdir -p /root/.devon/
+touch /root/.devon/.license.agreement
+echo "you accepted the devonfw-ide License.https://github.com/devonfw/ide/blob/master/documentation/LICENSE.asciidoc" >> /root/.devon/.license.agreement
+
+wget -c https://bit.ly/2BCkFa9 -O - | tar -xz
+
+bash setup /root/devonfw-settings/settings.git
+
+
+. ~/.bashrc