Compare commits
No commits in common. "develop" and "feature/50-add-support-for-sshfs-options" have entirely different histories.
develop
...
feature/50
3 changed files with 4 additions and 27 deletions
2
Makefile
2
Makefile
|
@ -24,7 +24,7 @@ test:
|
||||||
install:
|
install:
|
||||||
install \
|
install \
|
||||||
-m 755 \
|
-m 755 \
|
||||||
bin/mfm \
|
bin/code-preloader \
|
||||||
$(PREFIX)/bin
|
$(PREFIX)/bin
|
||||||
|
|
||||||
.PHONY: spec test build all prepare install
|
.PHONY: spec test build all prepare install
|
||||||
|
|
|
@ -180,5 +180,5 @@ By contributing, you agree to our code of conduct and license terms.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
GNU GPL-3
|
GNU GPL-3
|
||||||
|
|
||||||
|
|
|
@ -94,34 +94,11 @@ module GX
|
||||||
exit(1)
|
exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
## PASS 1
|
|
||||||
file_data = File.read(config_path)
|
file_data = File.read(config_path)
|
||||||
file_patched = Crinja.render(
|
file_patched = Crinja.render(file_data, {"env" => ENV.to_h})
|
||||||
file_data,
|
|
||||||
{
|
|
||||||
"env" => ENV.to_h,
|
|
||||||
"mfm" => {
|
|
||||||
"global" => {"mount_point_base" => "" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
root = Models::RootConfig.from_yaml(file_patched)
|
|
||||||
|
|
||||||
mount_point_base_safe = root.global.mount_point_base
|
|
||||||
raise Models::InvalidMountpointError.new("Invalid global mount point") if mount_point_base_safe.nil?
|
|
||||||
|
|
||||||
## PASS 2
|
|
||||||
file_patched = Crinja.render(
|
|
||||||
file_data,
|
|
||||||
{
|
|
||||||
"env" => ENV.to_h,
|
|
||||||
"mfm" => {
|
|
||||||
"global" => {"mount_point_base" => mount_point_base_safe }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
root = Models::RootConfig.from_yaml(file_patched)
|
root = Models::RootConfig.from_yaml(file_patched)
|
||||||
|
|
||||||
mount_point_base_safe = root.global.mount_point_base
|
mount_point_base_safe = root.global.mount_point_base
|
||||||
raise Models::InvalidMountpointError.new("Invalid global mount point") if mount_point_base_safe.nil?
|
raise Models::InvalidMountpointError.new("Invalid global mount point") if mount_point_base_safe.nil?
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue