Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pix/command/graph.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defmodule Pix.Command.Graph do
@spec cmd(Pix.UserSettings.t(), Pix.Config.t(), OptionParser.argv()) :: :ok
def cmd(user_settings, config, argv) do
{cli_opts, args} = Pix.Helper.option_parser_parse!(argv, strict: @cli_args)
cli_opts = Keyword.merge(cli_opts, user_settings.command.graph.cli_opts)
cli_opts = Keyword.merge(user_settings.command.graph.cli_opts, cli_opts)
config_pipelines = config.pipelines

case args do
Expand Down
2 changes: 1 addition & 1 deletion lib/pix/command/ls.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defmodule Pix.Command.Ls do
@spec cmd(Pix.UserSettings.t(), Pix.Config.t(), OptionParser.argv()) :: :ok
def cmd(user_settings, config, argv) do
{cli_opts, args} = Pix.Helper.option_parser_parse!(argv, strict: @cli_args)
cli_opts = Keyword.merge(cli_opts, user_settings.command.ls.cli_opts)
cli_opts = Keyword.merge(user_settings.command.ls.cli_opts, cli_opts)
verbose? = Keyword.get(cli_opts, :verbose, false)
hidden? = Keyword.get(cli_opts, :hidden, false)
config_pipelines = config.pipelines
Expand Down
2 changes: 1 addition & 1 deletion lib/pix/command/run.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Pix.Command.Run do
@spec cmd(Pix.UserSettings.t(), Pix.Config.t(), OptionParser.argv()) :: :ok
def cmd(user_settings, config, argv) do
{cli_opts, args} = Pix.Helper.option_parser_parse!(argv, strict: @cli_args)
cli_opts = Keyword.merge(cli_opts, user_settings.command.run.cli_opts)
cli_opts = Keyword.merge(user_settings.command.run.cli_opts, cli_opts)
config_pipelines = config.pipelines

validate_run_cli_opts!(cli_opts)
Expand Down
2 changes: 1 addition & 1 deletion lib/pix/command/shell.ex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defmodule Pix.Command.Shell do
@spec cmd(Pix.UserSettings.t(), Pix.Config.t(), OptionParser.argv()) :: :ok
def cmd(user_settings, config, argv) do
{cli_opts, args} = Pix.Helper.option_parser_parse!(argv, strict: @cli_args)
cli_opts = Keyword.merge(cli_opts, user_settings.command.shell.cli_opts)
cli_opts = Keyword.merge(user_settings.command.shell.cli_opts, cli_opts)
config_pipelines = config.pipelines

case args do
Expand Down
2 changes: 1 addition & 1 deletion lib/pix/command/upgrade.ex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Pix.Command.Upgrade do
def cmd(user_settings, argv) do
{cli_opts, _args} = Pix.Helper.option_parser_parse!(argv, strict: @cli_args)

cli_opts = Keyword.merge(cli_opts, user_settings.command.upgrade.cli_opts)
cli_opts = Keyword.merge(user_settings.command.upgrade.cli_opts, cli_opts)
dry_run? = Keyword.get(cli_opts, :dry_run, false)

current_version = Application.fetch_env!(:pix, :version)
Expand Down
Loading