From 32fea233d12991c3c5a33a5438a2967d600ab107 Mon Sep 17 00:00:00 2001 From: Glenn Date: Fri, 24 Nov 2023 10:49:55 +0100 Subject: [PATCH] fix: rename global.mount_point to avoid misunderstanding --- src/config.cr | 6 +++--- src/models/global_config.cr | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config.cr b/src/config.cr index 9d81936..17dbfd2 100644 --- a/src/config.cr +++ b/src/config.cr @@ -90,13 +90,13 @@ module GX root = Models::RootConfig.from_yaml(file_patched) - global_mount_point = root.global.mount_point - raise Models::InvalidMountpointError.new("Invalid global mount point") if global_mount_point.nil? + mount_point_base_safe = root.global.mount_point_base + raise Models::InvalidMountpointError.new("Invalid global mount point") if mount_point_base_safe.nil? root.filesystems.each do |selected_filesystem| if !selected_filesystem.mount_point? selected_filesystem.mount_point = - File.join(global_mount_point, selected_filesystem.mounted_name) + File.join(mount_point_base_safe, selected_filesystem.mounted_name) end end @root = root diff --git a/src/models/global_config.cr b/src/models/global_config.cr index 91cf2b7..2e827a7 100644 --- a/src/models/global_config.cr +++ b/src/models/global_config.cr @@ -14,16 +14,16 @@ module GX::Models include YAML::Serializable include YAML::Serializable::Strict - @[YAML::Field(key: "mount_point")] - getter mount_point : String? + @[YAML::Field(key: "mount_point_base")] + getter mount_point_base : String? def after_initialize() raise InvalidEnvironmentError.new("Home directory not found") if !ENV["HOME"]? home_dir = ENV["HOME"] # Set default mountpoint from global if none defined - if @mount_point.nil? || @mount_point.try &.empty? - @mount_point = File.join(home_dir, "mnt") + if @mount_point_base.nil? || @mount_point_base.try &.empty? + @mount_point_base = File.join(home_dir, "mnt") end end end