Compare commits

..

6 commits

Author SHA1 Message Date
fca2564987 Merge branch 'feature/1-add-support-for-fs-crud' of code.apps.glenux.net:glenux/mfm into feature/1-add-support-for-fs-crud
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-11-26 16:33:26 +01:00
7dec0da91c feat: add scaffold for operations (command design pattern) 2023-11-26 16:32:57 +01:00
de8c777a3c feat: add base structure for commands 2023-11-26 16:32:57 +01:00
1ce05411e0 feat: add scaffold for operations (command design pattern) 2023-11-26 16:32:57 +01:00
0eda2a1003 Merge pull request 'feat: add defaut FZF options when none defined' (#34) from feature/29-add-default-display-options-for-fzf into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #34
2023-11-26 15:29:14 +00:00
3a30fd8a86 feat: add defaut FZF options when none defined
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-11-26 16:21:47 +01:00
2 changed files with 8 additions and 0 deletions

View file

@ -98,6 +98,7 @@ module GX
when Config::Mode::ShowVersion when Config::Mode::ShowVersion
STDOUT.puts "#{PROGRAM_NAME} #{VERSION}" STDOUT.puts "#{PROGRAM_NAME} #{VERSION}"
when Config::Mode::Mount when Config::Mode::Mount
@config.load_from_env
@config.load_from_file @config.load_from_file
filesystem = choose_filesystem filesystem = choose_filesystem
raise Models::InvalidFilesystemError.new("Invalid filesystem") if filesystem.nil? raise Models::InvalidFilesystemError.new("Invalid filesystem") if filesystem.nil?

View file

@ -72,6 +72,13 @@ module GX
raise MissingFileError.new("Configuration file not found") raise MissingFileError.new("Configuration file not found")
end end
def load_from_env()
if !ENV["FZF_DEFAULT_OPTS"]?
# force defaults settings if none defined
ENV["FZF_DEFAULT_OPTS"] = "--height 40% --layout=reverse --border"
end
end
def load_from_file def load_from_file
config_path = @path config_path = @path
if config_path.nil? if config_path.nil?