Skip to content

Commit aeed450

Browse files
committed
args: change --allow-command-tag to --disallow-command-tag
To be honest yeah it's kinda annoying "advertising" a feature and then having to pass an option to enable it everytime. Just reverse it ngl
1 parent 89950f0 commit aeed450

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

include/config.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ class Config
125125
std::vector<std::string> args_layout;
126126
std::string args_custom_distro;
127127
std::string args_image_backend;
128-
std::uint16_t m_offset_calc = 0;
129-
bool args_disable_source = false;
130-
bool args_disable_colors = false;
131-
bool args_allow_commands = false;
132-
bool m_display_distro = true;
133-
bool args_print_logo_only = false;
128+
std::uint16_t m_offset_calc = 0;
129+
bool m_display_distro = true;
130+
bool args_disable_source = false;
131+
bool args_disable_colors = false;
132+
bool args_disallow_commands = false;
133+
bool args_print_logo_only = false;
134134

135135
std::unordered_map<std::string, override_configs_types> overrides;
136136

src/main.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ ADVANCED/CONFIG:
140140
--color <STRING> Replace a color globally. Syntax: "name=hex" (no spaces around "=").
141141
Example: "--color magenta=#FF00FF".
142142
143-
--allow-command-tag Allow bash command tags $() to be executed in the config or -m args.
143+
--disallow-command-tag Do not allow command tags $() to be executed in the config or -m args.
144144
This is a safety measure for preventing malicious code to be executed because you didn't want to check the config first.
145145
146146
INFORMATIONAL:
@@ -596,20 +596,20 @@ static bool parseargs(int argc, char* argv[], Config& config, const std::string_
596596
{"source-path", required_argument, 0, 's'},
597597
{"image-backend", required_argument, 0, 'i'},
598598

599-
{"list-logos", no_argument, 0, "list-logos"_fnv1a16},
600-
{"allow-command-tag", no_argument, 0, "allow-command-tag"_fnv1a16},
601-
{"sep-reset-after", optional_argument, 0, "sep-reset-after"_fnv1a16},
602-
{"debug", optional_argument, 0, "debug"_fnv1a16},
603-
{"wrap-lines", optional_argument, 0, "wrap-lines"_fnv1a16},
604-
{"gen-config", optional_argument, 0, "gen-config"_fnv1a16},
605-
{"sep-reset", required_argument, 0, "sep-reset"_fnv1a16},
606-
{"title-sep", required_argument, 0, "title-sep"_fnv1a16},
607-
{"logo-padding-top", required_argument, 0, "logo-padding-top"_fnv1a16},
608-
{"logo-padding-left", required_argument, 0, "logo-padding-left"_fnv1a16},
609-
{"layout-padding-top", required_argument, 0, "layout-padding-top"_fnv1a16},
610-
{"loop-ms", required_argument, 0, "loop-ms"_fnv1a16},
611-
{"bg-image", required_argument, 0, "bg-image"_fnv1a16},
612-
{"color", required_argument, 0, "color"_fnv1a16},
599+
{"list-logos", no_argument, 0, "list-logos"_fnv1a16},
600+
{"disallow-command-tag", no_argument, 0, "disallow-command-tag"_fnv1a16},
601+
{"sep-reset-after", optional_argument, 0, "sep-reset-after"_fnv1a16},
602+
{"debug", optional_argument, 0, "debug"_fnv1a16},
603+
{"wrap-lines", optional_argument, 0, "wrap-lines"_fnv1a16},
604+
{"gen-config", optional_argument, 0, "gen-config"_fnv1a16},
605+
{"sep-reset", required_argument, 0, "sep-reset"_fnv1a16},
606+
{"title-sep", required_argument, 0, "title-sep"_fnv1a16},
607+
{"logo-padding-top", required_argument, 0, "logo-padding-top"_fnv1a16},
608+
{"logo-padding-left", required_argument, 0, "logo-padding-left"_fnv1a16},
609+
{"layout-padding-top", required_argument, 0, "layout-padding-top"_fnv1a16},
610+
{"loop-ms", required_argument, 0, "loop-ms"_fnv1a16},
611+
{"bg-image", required_argument, 0, "bg-image"_fnv1a16},
612+
{"color", required_argument, 0, "color"_fnv1a16},
613613

614614
{0,0,0,0}
615615
};
@@ -664,8 +664,8 @@ static bool parseargs(int argc, char* argv[], Config& config, const std::string_
664664
case 'L':
665665
config.args_print_logo_only = true; break;
666666

667-
case "allow-command-tag"_fnv1a16:
668-
config.args_allow_commands = true; break;
667+
case "disallow-command-tag"_fnv1a16:
668+
config.args_disallow_commands = true; break;
669669

670670
case "logo-padding-top"_fnv1a16:
671671
config.overrides["config.logo-padding-top"] = {.value_type = INT, .int_value = std::stoi(optarg)}; break;

src/parse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ std::optional<std::string> parse_command_tag(Parser& parser, parse_args_t& parse
296296
if (!evaluate)
297297
return {};
298298

299-
if (!parse_args.config.args_allow_commands)
300-
die(_("Trying to execute command `{}` but --allow-command-tag is not set"), command);
299+
if (parse_args.config.args_disallow_commands)
300+
die(_("Trying to execute command $({}) but --disallow-command-tag is set"), command);
301301

302302
const bool removetag = (command.front() == '!');
303303
if (removetag)

0 commit comments

Comments
 (0)