From patchwork Sat Apr 29 10:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 49675 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4109327BBE2; Sat, 29 Apr 2023 11:26:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4D2FF1796D for ; Sat, 29 Apr 2023 11:26:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pshmS-0003Nj-PT; Sat, 29 Apr 2023 06:26:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pshmE-0003MW-Ny for guix-patches@gnu.org; Sat, 29 Apr 2023 06:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pshmE-00064s-89 for guix-patches@gnu.org; Sat, 29 Apr 2023 06:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pshmD-00075E-MN for guix-patches@gnu.org; Sat, 29 Apr 2023 06:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63145] [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Apr 2023 10:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 63145@debbugs.gnu.org Received: via spool by 63145-submit@debbugs.gnu.org id=B63145.168276393127183 (code B ref 63145); Sat, 29 Apr 2023 10:26:01 +0000 Received: (at 63145) by debbugs.gnu.org; 29 Apr 2023 10:25:31 +0000 Received: from localhost ([127.0.0.1]:35283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pshlj-00074N-3c for submit@debbugs.gnu.org; Sat, 29 Apr 2023 06:25:31 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:56803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pshlg-000745-FS for 63145@debbugs.gnu.org; Sat, 29 Apr 2023 06:25:29 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2aa39ce5d26so6629541fa.1 for <63145@debbugs.gnu.org>; Sat, 29 Apr 2023 03:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682763922; x=1685355922; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=sRZg8fGF0cZdx7+IM5dcwUJhVMqiHd2QzUXf0tCGV0s=; b=e5m/ez50TXbj2K29KJZCsMUncA7QfycDILzgSMEyICh0lsLnvi7OhKfZHu0zFpsK23 1/+b/jUxh+krnFXo+nmO43xIvun+xqfB1PqWIC6tpMiw3bIM89vK2X0cSWs6j5xNkOUa fen5fKBij85YwonCHQ+g/VGIuQCKifQWNHLYrKAz6tmYHrPci08uVim3orVEsTKIL5lU yfSQT+wak21/NICQhb6M2hARISPnxqLNZdFqEAj1PXq0q5tokN2vP06QiJQ52PjpsA5r 8MFKsYbeLYptFEFP2Zt2f4JLt98iZjk2Kkz4i0pjH4sC6bLjXv6xDJsdvapQ/mmANOvG +MYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682763922; x=1685355922; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sRZg8fGF0cZdx7+IM5dcwUJhVMqiHd2QzUXf0tCGV0s=; b=cd0HZrQH+LDdPT3RYKszgEf10JnJMt4otbyGPFSMga8sn20of/u9Bi3G1j2SShRUU6 zas7BSqNP+aexn0Me/87EbG9C6J9ELYkyxWBbsa7Fq68H86G6ctGExUTZtmCZCQ+h4FT +rbDVdHrDXexBuUSq+CQU/h6dwAbLWXrd7YhU3Q6eDEgM4IFUkQ9vqHDS2i6YLVxJJil Raq4PrhpgJec9A2NE0z1VjMVRDDqg9aKHc2eHYXNgIbdiYi8RxVBnTN1R+t0jir1RuBo 51CxhInO4xfwGpn1RPsGXbIxCT1NJ+7FY+ggRANxzpFE6dG3Un7qbYi6bOvInCI2wHnn fRzQ== X-Gm-Message-State: AC+VfDzUpz4B5KlQjnHqxuzaiOd6jqYb7SL9N0LiGsswVxidV6Sqq4oV 7j39IjV9J8fDDGQokKHeUbSdCVcwO5MuagGsjjY= X-Google-Smtp-Source: ACHHUZ5UWiSukZ90uXm21ZfuT0+BYHGC86hDLI7gXxLdyRpyqwChwqvBCEjbbH+9ApO2TyJaFfGICshOOK345bFef5o= X-Received: by 2002:a2e:2e12:0:b0:2a9:9e99:a508 with SMTP id u18-20020a2e2e12000000b002a99e99a508mr2074453lju.53.1682763921598; Sat, 29 Apr 2023 03:25:21 -0700 (PDT) MIME-Version: 1.0 References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> <877ctvsq9u.fsf@gnu.org> In-Reply-To: <877ctvsq9u.fsf@gnu.org> From: Rostislav Svoboda Date: Sat, 29 Apr 2023 12:24:45 +0200 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Ludo, > We could definitely factorize along the lines of what you propose. > Would you like to update these two patches? Here are the updated patches. Cheers Bost From fb7774525924d59bf212a122301aa47766f53b0e Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Sat, 29 Apr 2023 11:56:24 +0200 Subject: [PATCH 1/2] gnu: maven-*-*: DRY add-missing-shebang. * gnu/packages/maven.scm - maven-settings-builder - maven-model-builder - maven-resolver-provider - maven-core-bootstrap - maven-embedder Implement common functionality just once in the `add-missing-shebang`. --- gnu/packages/maven.scm | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a805bda8e5..8c44e68d31 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2023 Aleksandr Vityazev +;;; Copyright © 2023 Rostislav Svoboda ;;; ;;; This file is part of GNU Guix. ;;; @@ -1355,6 +1356,11 @@ (define-public maven-settings tool. This package contains strictly the model for Maven settings, that is simply plain java objects."))) +(define add-missing-shebang + `(lambda _ + (substitute* "sisu.sh" + (("^## T") "#!/bin/sh\n## T")))) + (define-public maven-settings-builder (package (inherit maven-artifact) @@ -1366,10 +1372,7 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) + (add-after 'unpack 'add-sisu-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1411,10 +1414,7 @@ (define-public maven-model-builder (copy-recursively "src/main/resources" "build/classes") #t)) - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) + (add-after 'unpack 'add-sisu-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1510,10 +1510,7 @@ (define-public maven-resolver-provider #:tests? #f; dependency loop on maven-core (@Component RepositorySystem) #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) + (add-after 'unpack 'add-sisu-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1604,10 +1601,7 @@ (define-public maven-core-bootstrap #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) + (add-after 'unpack 'add-sisu-shebang ,add-missing-shebang) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core @@ -1839,10 +1833,7 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) + (add-after 'unpack 'add-sisu-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.39.2