From 3727af11c4084fe9c0309be62c525727d98e1514 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Mon, 29 Nov 2021 09:30:10 +0100
Subject: [PATCH] Minor bugfixes with custom scripts

---
 src/cpl_cli/command/remove_service.py         |  3 ++-
 src/cpl_cli/source_creator/console_builder.py | 18 +++++++++++-------
 src/cpl_cli/source_creator/library_builder.py | 14 +++++++++-----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/cpl_cli/command/remove_service.py b/src/cpl_cli/command/remove_service.py
index 701a43fe..5b8fed6d 100644
--- a/src/cpl_cli/command/remove_service.py
+++ b/src/cpl_cli/command/remove_service.py
@@ -57,7 +57,8 @@ class RemoveService(CommandABC):
         ws_dict = {
             WorkspaceSettings.__name__: {
                 WorkspaceSettingsNameEnum.default_project.value: self._workspace.default_project,
-                WorkspaceSettingsNameEnum.projects.value: self._workspace.projects
+                WorkspaceSettingsNameEnum.projects.value: self._workspace.projects,
+                WorkspaceSettingsNameEnum.scripts.value: self._workspace.scripts
             }
         }
 
diff --git a/src/cpl_cli/source_creator/console_builder.py b/src/cpl_cli/source_creator/console_builder.py
index ab1e91e9..ed837005 100644
--- a/src/cpl_cli/source_creator/console_builder.py
+++ b/src/cpl_cli/source_creator/console_builder.py
@@ -39,12 +39,12 @@ class ConsoleBuilder:
             project_json.close()
 
     @classmethod
-    def _create_workspace(cls, path: str, project_name, projects: dict):
+    def _create_workspace(cls, path: str, project_name, projects: dict, scripts: dict):
         ws_dict = {
             WorkspaceSettings.__name__: {
                 WorkspaceSettingsNameEnum.default_project.value: project_name,
                 WorkspaceSettingsNameEnum.projects.value: projects,
-                WorkspaceSettingsNameEnum.scripts.value: {}
+                WorkspaceSettingsNameEnum.scripts.value: scripts
             }
         }
 
@@ -151,14 +151,18 @@ class ConsoleBuilder:
             workspace_file_path = f'{proj_name}/cpl-workspace.json'
             project_file_rel_path = f'{src_path}/{project_name}.json'
             project_file_path = f'{proj_name}/{src_path}/{project_name}.json'
-            cls._create_workspace(workspace_file_path, project_name, {
-                project_name: project_file_rel_path
-            })
+            cls._create_workspace(
+                workspace_file_path,
+                project_name, 
+                {
+                    project_name: project_file_rel_path
+                },
+                {}
+            )
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json',
-                                  workspace.default_project, workspace.projects)
+            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects, workspace.scripts)
 
         Console.spinner(
             f'Creating {project_file_path}',
diff --git a/src/cpl_cli/source_creator/library_builder.py b/src/cpl_cli/source_creator/library_builder.py
index 126440ad..709ff144 100644
--- a/src/cpl_cli/source_creator/library_builder.py
+++ b/src/cpl_cli/source_creator/library_builder.py
@@ -154,14 +154,18 @@ class LibraryBuilder:
             workspace_file_path = f'{proj_name}/cpl-workspace.json'
             project_file_rel_path = f'{src_path}/{project_name}.json'
             project_file_path = f'{proj_name}/{src_path}/{project_name}.json'
-            cls._create_workspace(workspace_file_path, project_name, {
-                project_name: project_file_rel_path
-            })
+            cls._create_workspace(
+                workspace_file_path,
+                project_name, 
+                {
+                    project_name: project_file_rel_path
+                },
+                {}
+            )
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json',
-                                  workspace.default_project, workspace.projects)
+            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects, workspace.scripts)
 
         Console.spinner(
             f'Creating {project_file_path}',