From 3d47efdc1b4100de43a86af5bffeb9d3bf99c0d3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 21 Jan 2025 18:53:06 +0100 Subject: [PATCH] woodpecker-cli: calling woodpecker instead of woodpecker-cli is now deprecated according to upstream starting with v3.0.0. Previously the opposite was true, so we simply invert the deprecation wrapper added in ee4670a8210d326e2de4f38f5cb7e87b24bd2264. Ref: 3d7e60beb0224d40e86f4120e15302cdb0af94e9 --- .../continuous-integration/woodpecker/cli.nix | 2 +- .../continuous-integration/woodpecker/common.nix | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index a67b628aa084..68b4218a60e0 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -18,6 +18,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; - mainProgram = "woodpecker"; + mainProgram = "woodpecker-cli"; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 24b3384e792a..ad60a06cc551 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -18,18 +18,16 @@ in cd $out/bin for f in *; do if [ "$f" = cli ]; then - mv -- "$f" "woodpecker" # Issue a warning to the user if they call the deprecated executable - cat >woodpecker-cli << EOF + cat >woodpecker << EOF #!/bin/sh - echo 'WARNING: calling \`woodpecker-cli\` is deprecated, use \`woodpecker\` instead.' >&2 - $out/bin/woodpecker "\$@" + echo 'WARNING: calling \`woodpecker\` is deprecated, use \`woodpecker-cli\` instead.' >&2 + $out/bin/woodpecker-cli "\$@" EOF - chmod +x woodpecker-cli - patchShebangs woodpecker-cli - else - mv -- "$f" "woodpecker-$f" + chmod +x woodpecker + patchShebangs woodpecker fi + mv -- "$f" "woodpecker-$f" done cd - '';