From 3d7e60beb0224d40e86f4120e15302cdb0af94e9 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 10 Feb 2024 18:52:27 +0000 Subject: [PATCH] woodpecker: use upstream naming for cli executable The intended executable name is supposed to be `woodpecker`, not `woodpecker-cli`, as pointed out in [1]. [1]: https://github.com/woodpecker-ci/woodpecker/issues/2112 --- .../tools/continuous-integration/woodpecker/cli.nix | 2 +- .../tools/continuous-integration/woodpecker/common.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index d1f1da881681..2121258f3c04 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -12,6 +12,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; - mainProgram = "woodpecker-cli"; + mainProgram = "woodpecker"; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index bad183d98125..584152223b21 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -17,7 +17,11 @@ in postInstall = '' cd $out/bin for f in *; do - mv -- "$f" "woodpecker-$f" + if [ "$f" = cli ]; then + mv -- "$f" "woodpecker" + else + mv -- "$f" "woodpecker-$f" + fi done cd - '';