glenux/mfm
glenux/mfm
1
0
Fork 1
Code Issues 20 Pull requests 5 Projects 1 Releases 2 Packages 1 Wiki Activity

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
Details

Browse source 
Reviewed-on: #34
This commit is contained in:
Glenn Y. Rolland 2023-11-26 15:29:14 +00:00
commit 0eda2a1003
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cli.cr
View file

@ -96,6 +96,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?

7
src/config.cr
View file

@ -73,6 +73,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?