From bb60c75851fffa44ab8f5aa6564bf3f58d0a329f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Dehenne?= Date: Thu, 26 Dec 2024 15:31:03 +0100 Subject: [PATCH 1/2] Fix path detection in preparerelease.py check_snow_path was looking for the old "other" directory instead of "newicons". It thus displayed a warning "The path 'path/to/snow" does not include the 'Snow' folder." when invoking the script with: python scripts/preparerelease.py path/to/snow --- scripts/preparerelease.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/preparerelease.py b/scripts/preparerelease.py index cd2225b..f69d52b 100644 --- a/scripts/preparerelease.py +++ b/scripts/preparerelease.py @@ -23,8 +23,8 @@ def check_snow_path(path): return snow_folder else: app_folder = os.path.join(path, "app") - other_folder = os.path.join(path, "other") - if os.path.exists(other_folder) and os.path.isdir(other_folder) and os.path.exists(app_folder) and os.path.isdir(app_folder): + newicons_folder = os.path.join(path, "newicons") + if os.path.exists(newicons_folder) and os.path.isdir(newicons_folder) and os.path.exists(app_folder) and os.path.isdir(app_folder): return path else: print(f"The path '{path}' does not include the 'Snow' folder.") @@ -366,7 +366,7 @@ def missingDrawable(appfilterpath:str,whitedir:str,otherdir:str): if len(drawables) > 0: print('\n\n______ Found non existent drawables ______\n') - print('Possible causes are typos or completly different naming of the icon\n\n') + print('Possible causes are typos or completely different naming of the icon\n\n') for item in drawables: toprint = etree.tostring(item,encoding='unicode',method='xml') print(f'{toprint}') From 96b754ba19462dacad4866162374a18312f7567a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Dehenne?= Date: Thu, 26 Dec 2024 15:57:09 +0100 Subject: [PATCH 2/2] Fix typo --- preparehelper/src/main/java/helper/PrepareRelease.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preparehelper/src/main/java/helper/PrepareRelease.java b/preparehelper/src/main/java/helper/PrepareRelease.java index 213ad7b..8887dcf 100644 --- a/preparehelper/src/main/java/helper/PrepareRelease.java +++ b/preparehelper/src/main/java/helper/PrepareRelease.java @@ -60,7 +60,7 @@ public static void main(String[] args) throws Exception { public static void executePythonScript(String... args) throws Exception { List command = new ArrayList<>(); command.add("python"); - // Add all provided argumentsto the command list + // Add all provided arguments to the command list command.addAll(Arrays.asList(args)); command.add("..");