From 30807f143666302142a55529ad72fa12ad037219 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Thu, 15 Jul 2021 21:30:09 +0700 Subject: [PATCH] Use relative rather than absolute paths This should allow GodotXterm be installed in locations other than `addons/godot_xterm`. --- .../editor_plugins/terminal/editor_terminal.gd | 2 +- .../import_plugins/asciicast_import_plugin.gd | 2 +- addons/godot_xterm/plugin.gd | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.gd b/addons/godot_xterm/editor_plugins/terminal/editor_terminal.gd index fd5c152..2dd7bb1 100644 --- a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.gd +++ b/addons/godot_xterm/editor_plugins/terminal/editor_terminal.gd @@ -1,5 +1,5 @@ tool -extends "res://addons/godot_xterm/nodes/terminal/terminal.gd" +extends "../../nodes/terminal/terminal.gd" signal exited(exit_code, signum) diff --git a/addons/godot_xterm/import_plugins/asciicast_import_plugin.gd b/addons/godot_xterm/import_plugins/asciicast_import_plugin.gd index b206311..47343e9 100644 --- a/addons/godot_xterm/import_plugins/asciicast_import_plugin.gd +++ b/addons/godot_xterm/import_plugins/asciicast_import_plugin.gd @@ -1,7 +1,7 @@ tool extends EditorImportPlugin -const Asciicast = preload("res://addons/godot_xterm/resources/asciicast.gd") +const Asciicast = preload("../resources/asciicast.gd") func get_importer_name(): diff --git a/addons/godot_xterm/plugin.gd b/addons/godot_xterm/plugin.gd index e3930d7..309ad64 100644 --- a/addons/godot_xterm/plugin.gd +++ b/addons/godot_xterm/plugin.gd @@ -7,22 +7,23 @@ var terminal_panel: Control func _enter_tree(): - asciicast_import_plugin = preload("res://addons/godot_xterm/import_plugins/asciicast_import_plugin.gd").new() + asciicast_import_plugin = preload("./import_plugins/asciicast_import_plugin.gd").new() add_import_plugin(asciicast_import_plugin) - var asciicast_script = preload("res://addons/godot_xterm/resources/asciicast.gd") + var asciicast_script = preload("./resources/asciicast.gd") add_custom_type("Asciicast", "Animation", asciicast_script, null) - var terminal_script = preload("res://addons/godot_xterm/nodes/terminal/terminal.gd") - var terminal_icon = preload("res://addons/godot_xterm/nodes/terminal/terminal_icon.svg") + var terminal_script = preload("./nodes/terminal/terminal.gd") + var terminal_icon = preload("./nodes/terminal/terminal_icon.svg") add_custom_type("Terminal", "Control", terminal_script, terminal_icon) if pty_supported: - var pty_icon = load("res://addons/godot_xterm/nodes/pty/pty_icon.svg") + var base_dir = get_script().resource_path.get_base_dir() + var pty_icon = load("%s/nodes/pty/pty_icon.svg" % base_dir) var pty_script match OS.get_name(): "X11", "Server", "OSX": - pty_script = load("res://addons/godot_xterm/nodes/pty/unix/pty_unix.gd") + pty_script = load("%s/nodes/pty/unix/pty_unix.gd" % base_dir) add_custom_type("PTY", "Node", pty_script, pty_icon) var terminal_settings_script = preload("./editor_plugins/terminal/settings/terminal_settings.gd") add_custom_type("TerminalSettings", "Resource", terminal_settings_script, null)