Skip to content

Commit

Permalink
commands/include: handle many files in single line
Browse files Browse the repository at this point in the history
i3 supports including multiple files in a single line, whereas sway
limits to single file per line.
  • Loading branch information
mTvare6 authored and emersion committed Nov 17, 2024
1 parent a2c73c9 commit fec3da7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions sway/commands/include.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

struct cmd_results *cmd_include(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "include", EXPECTED_EQUAL_TO, 1))) {
if ((error = checkarg(argc, "include", EXPECTED_AT_LEAST, 1))) {
return error;
}

char *files = join_args(argv, argc);
// We don't care if the included config(s) fails to load.
load_include_configs(argv[0], config, &config->swaynag_config_errors);
load_include_configs(files, config, &config->swaynag_config_errors);

return cmd_results_new(CMD_SUCCESS, NULL);
}
4 changes: 2 additions & 2 deletions sway/sway.5.scd
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ The following commands may only be used in the configuration file.
*default_orientation* horizontal|vertical|auto
Sets the default container layout for tiled containers.

*include* <path>
Includes another file from _path_. _path_ can be either a full path or a
*include* <paths...>
Include files from _paths_. _paths_ can include either a full path or a
path relative to the parent config, and expands shell syntax (see
*wordexp*(3) for details). The same include file can only be included once;
subsequent attempts will be ignored.
Expand Down

0 comments on commit fec3da7

Please sign in to comment.