From 6bb3927e7aa18c59779c332e8911b19b9fcc1159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 8 Jan 2023 22:20:36 +0100 Subject: [PATCH 1/2] Remove gray color in help output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/args.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/args.c b/src/args.c index 2df77a88..e5917f15 100644 --- a/src/args.c +++ b/src/args.c @@ -65,7 +65,6 @@ const char** argv_dnsmasq = NULL; #define COL_ULINE "\x1b[4m" // underline font #define COL_GREEN "\x1b[32m" // normal foreground color #define COL_YELLOW "\x1b[33m" // normal foreground color -#define COL_GRAY "\x1b[90m" // bright foreground color #define COL_RED "\x1b[91m" // bright foreground color #define COL_BLUE "\x1b[94m" // bright foreground color #define COL_PURPLE "\x1b[95m" // bright foreground color @@ -431,7 +430,6 @@ void parse_args(int argc, char* argv[]) const char *normal = cli_normal(); const char *blue = cli_color(COL_BLUE); const char *cyan = cli_color(COL_CYAN); - const char *gray = cli_color(COL_GRAY); const char *green = cli_color(COL_GREEN); const char *yellow = cli_color(COL_YELLOW); const char *purple = cli_color(COL_PURPLE); @@ -458,8 +456,8 @@ void parse_args(int argc, char* argv[]) printf(" Example: %spihole-FTL regex-test %ssomebad.domain %sbad%s\n", green, blue, cyan, normal); printf(" to test %ssomebad.domain%s against %sbad%s\n\n", blue, normal, cyan, normal); - printf(" An optional %s-q%s prevents any output (exit code testing):\n", gray, normal); - printf(" %spihole-FTL %s-q%s regex-test %ssomebad.domain %sbad%s\n\n", green, gray, green, blue, cyan, normal); + printf(" An optional %s-q%s prevents any output (exit code testing):\n", purple, normal); + printf(" %spihole-FTL %s-q%s regex-test %ssomebad.domain %sbad%s\n\n", green, purple, green, blue, cyan, normal); printf("%sEmbedded Lua engine:%s\n", yellow, normal); printf("\t%s--lua%s, %slua%s FTL's lua interpreter\n", green, normal, green, normal); @@ -476,10 +474,10 @@ void parse_args(int argc, char* argv[]) printf(" the script.\n\n"); printf("%sEmbedded SQLite3 shell:%s\n", yellow, normal); - printf("\t%ssql %s[-h]%s, %ssqlite3 %s[-h]%s FTL's SQLite3 shell\n", green, gray, normal, green, gray, normal); - printf("\t%s-h%s starts a special %shuman-readable mode%s\n\n", gray, normal, bold, normal); + printf("\t%ssql %s[-h]%s, %ssqlite3 %s[-h]%s FTL's SQLite3 shell\n", green, purple, normal, green, purple, normal); + printf("\t%s-h%s starts a special %shuman-readable mode%s\n\n", purple, normal, bold, normal); - printf(" Usage: %spihole-FTL sqlite3 %s[-h] %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, gray, cyan, normal); + printf(" Usage: %spihole-FTL sqlite3 %s[-h] %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, purple, cyan, normal); printf(" Options:\n\n"); printf(" - %s[OPTIONS]%s is an optional set of options. All available\n", cyan, normal); printf(" options can be found in %spihole-FTL sqlite3 --help%s\n", green, normal); From 6333d4c2cd2ca25be03fcb54d147ce5e3a103b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Jan 2023 10:00:49 +0000 Subject: [PATCH 2/2] Bump benoitchantre/setup-ssh-authentication-action from 1.0.0 to 1.0.1 Bumps [benoitchantre/setup-ssh-authentication-action](https://github.com/benoitchantre/setup-ssh-authentication-action) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/benoitchantre/setup-ssh-authentication-action/releases) - [Changelog](https://github.com/benoitchantre/setup-ssh-authentication-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/benoitchantre/setup-ssh-authentication-action/compare/1.0.0...1.0.1) --- updated-dependencies: - dependency-name: benoitchantre/setup-ssh-authentication-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83b66bfe..50470690 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,7 +145,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} - name: Install SSH Key - uses: benoitchantre/setup-ssh-authentication-action@1.0.0 + uses: benoitchantre/setup-ssh-authentication-action@1.0.1 with: private-key: ${{ secrets.SSH_KEY }} known-hosts: ${{ secrets.KNOWN_HOSTS }}