Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Give default value to config from facter #189

Merged
merged 1 commit into from Jun 10, 2018
Merged

Give default value to config from facter #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/fpm/cookery/cli.rb
View file
Open in desktop
Expand Up @@ -59,18 +59,17 @@ def validate
end

# Override the detected platform.
if platform
if platform.nil?
config.platform = FPM::Cookery::Facts.platform
else
FPM::Cookery::Facts.platform = platform
end

if target
if target.nil?
config.target = FPM::Cookery::Facts.target
else
FPM::Cookery::Facts.target = target
end

if FPM::Cookery::Facts.target.nil?
Log.error "No target given and we're unable to detect your platform"
exit 1
end
end

def execute
Expand Down