From ffadebb0dfb682dd3d4fbefb7732856817f98b59 Mon Sep 17 00:00:00 2001 From: blinry Date: Mon, 12 Apr 2021 16:01:02 +0200 Subject: [PATCH] Simplify careful_delete even more by relying on user:// on each OS Closes #83. --- scenes/helpers.gd | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scenes/helpers.gd b/scenes/helpers.gd index a354f45..57dd61f 100644 --- a/scenes/helpers.gd +++ b/scenes/helpers.gd @@ -86,23 +86,15 @@ func parse_args(): return arguments func careful_delete(path_inside): - var expected_prefix + var expected_prefix = "%s/tmp/" % OS.get_user_data_dir() var os = OS.get_name() - - if os == "X11": - expected_prefix = "%s/.local/share/Oh My Git/tmp/" % OS.get_environment("HOME") - elif os == "OSX": - expected_prefix = "%s/Library/Application Support/Oh My Git/tmp/" % OS.get_environment("HOME") - elif os == "Windows": - expected_prefix = "%s/AppData/Roaming/Oh My Git/tmp/" % OS.get_environment("USERPROFILE") + if os == "Windows": # In the game, we use forward slashes: expected_prefix = expected_prefix.replace("\\", "/") # Windows treats paths case-insensitively: expected_prefix = expected_prefix.to_lower() path_inside = path_inside.to_lower() - else: - helpers.crash("Unsupported OS: %s" % os) if path_inside.substr(0,expected_prefix.length()) != expected_prefix: helpers.crash("Refusing to delete directory %s that does not start with %s" % [path_inside, expected_prefix])