From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 09:13:52 2023 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:13:52 +0000 Received: from localhost ([127.0.0.1]:60748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNv5-0008Ip-QE for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:13:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:51950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNv3-0008Ig-Tr for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:13:50 -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 1psNv2-0003k1-VJ for guix-patches@gnu.org; Fri, 28 Apr 2023 09:13:48 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNv0-00084K-SY for guix-patches@gnu.org; Fri, 28 Apr 2023 09:13:48 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-504ecbfddd5so14712102a12.0 for ; Fri, 28 Apr 2023 06:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687624; x=1685279624; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8pfsvOSs9zoCCBq3h1Vm5byWcN1bay9cB0MbdlrFmkI=; b=NWkUvSxKkSRdVc37m6A371THehCB0ULf2m36pCY5v5SRKD/uJftI4to9rUd7hwhZ1J 8U4v4hmPRDplkc43ZmpmV9mjMrTZnV0vJnjkckQr9ozrTWoTjvBfsS/koySf8YVTnBPv T5N4zTYlIdm1wVd/Cx0uVucunU1yR1dc169D8HIheFxQO+z6NjXMBTIAyMsGze1dbYSz 2829K8sqg8CrGQZZXFkehD3M5gvFDECD8DI6ChbjOIi/Q7DaIUI9YizJ3q9DojVzP66e 251FFZ2tp/eG6JUWTzo3w7WI/LOYrHlQeNeRTHaa9pJ0+Sjo+vm6Bj47amtb1mKhmZwE rZjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687624; x=1685279624; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8pfsvOSs9zoCCBq3h1Vm5byWcN1bay9cB0MbdlrFmkI=; b=bMcwFv3ic/jcNn/9pWjOffZt2D1lvVkhS6QA+b6SuYNFX+goMpn6v4GTczZ9XmjE/R /seHtxHXwNBp+fImOp0ewlUmCo37NPS3T18ktmnuvrrMhkvoC22Ogeca6tpJeN1oo49V HWOrG0NUZccbphNIZfObqVR61zPbOd7FCfgDboG+9gCT6aCGrZ+WC8bCazSw07/KTF+L JbLUJoMwF7T+fduKVkTQ5CTvlACdvFTJXxY+3TVKvYQmhqHPHF3c3Mb6P2ABtXSPkov/ JSBrwCY9XglG1dydcRxGLEZ5djE226gfkDUrwKgWLHXrmARhR/Y98V+Iy/15Ly66+u7K +LYA== X-Gm-Message-State: AC+VfDwAm4Ec8aaYJFJYapNRXlbw3UwhIIYrVVgSytescvY50h+YlrNA /pHCcsb6VOrFtBciFliKGJQFcfPZM1RGxQ== X-Google-Smtp-Source: ACHHUZ4hEwEBzwelw+cR+AxF8m7iwg3uWljWxLwS6kGzTzszdBJ6NRmJlfv+tI7UF583tmtPCMBQBg== X-Received: by 2002:aa7:c586:0:b0:504:9349:7901 with SMTP id g6-20020aa7c586000000b0050493497901mr3920862edq.38.1682687623673; Fri, 28 Apr 2023 06:13:43 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:13:42 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda To: guix-patches@gnu.org Subject: [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. Date: Fri, 28 Apr 2023 15:13:10 +0200 Message-Id: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Rostislav Svoboda X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/maven.scm - maven-settings-builder - maven-model-builder - maven-resolver-provider - maven-core-bootstrap - maven-embedder The sisu.sh script must have a shebang on the first line, otherwise an 'In execvp of ...: Exec format error' is indicated. --- gnu/packages/maven.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fc3a63c263..a3122bfa32 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1365,6 +1365,9 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1396,6 +1399,9 @@ (define-public maven-model-builder #:test-dir "src/test" #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'configure 'chdir (lambda _ ;; Required for tests that rely on the package's default @@ -1501,6 +1507,9 @@ (define-public maven-resolver-provider #:tests? #f; dependency loop on maven-core (@Component RepositorySystem) #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1591,6 +1600,9 @@ (define-public maven-core-bootstrap #:tests? #f #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core @@ -1822,6 +1834,9 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 09:14:27 2023 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:14:27 +0000 Received: from localhost ([127.0.0.1]:60753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNvf-0008Ke-AA for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:48264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNvd-0008KW-Dw for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:25 -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 1psNvd-0003qn-1a for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:25 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNvb-0008F9-AS for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:24 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-506b20efd4cso16730872a12.3 for ; Fri, 28 Apr 2023 06:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687661; x=1685279661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QSqPM5e2hTSEvUkdngLmcpj5fZ0DWcp1QRnOhCLKYMY=; b=ZDXpUzEk6srRXL6Fo3LJYmDdc9BiBe/kpnXsyZzWmSf/yJBvfPoSPMJX5i9KRD15eV eKkmV7Iidv6DGg6zcxnAg/5A+meAJo2fpkKeotZR0tUVcRSWNw506ET3UQq2KO5GaEXm 0xXzNM866ch7nuQIkyoeacaWeg/pmyX0NI3VzPHBbFyAjVdfvDtuj6OG2ZIRljtBVmhV JIFKi/sGjxcvlWqfADweC1Z5TaQu1kZrsXQigQRaTvLlU6edg3uwDv8dJftxYUemL1ZW cHRBO6ylS7ZZR6oGslqkO/mp9DDohiUyey0/hZ8MnQH8a0PlxxilFFtKQu3evC+7ImYQ sC2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687661; x=1685279661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QSqPM5e2hTSEvUkdngLmcpj5fZ0DWcp1QRnOhCLKYMY=; b=j7yGWapMDaoAHPSqsX6oEIgTcASSR+o7FbgALPfpWcE54XyeX9eTOw+rxk2YRfLJfJ 14DiDXPBWjdzssK2OGvkMRI64MxeiFpsmbz8b9BUuVDF1iGt4gv+AIomy9kSFIMhkNfe W5bGsDkuQyG4gUr7CoSgaUw8mwqtGw+Xg/tjzzAgyG8GEShFqcpDWVtVX561F+ARXQHo cYdltkGozDBpPlITc8Nzmu7Ri4gfZklNCWe8N6h4+e49ZSHgfHPq5Foa3uDj9Yyjdgxe ZJXVP1c3xpS7wTFQZ50wx7Bw7u5/c7c0SudPdu6RbvVw+5Dt8duMD4QgGXcOLu5O/mV1 uu1A== X-Gm-Message-State: AC+VfDyOwC8Ss9oZIcakaW6nEdCLNuRdOoRT3j+cMOfWKUxsaHUBAqQ6 5mLO8C53+JGpaFtzpR3cTx2kWn6LL6/y0w== X-Google-Smtp-Source: ACHHUZ5BZOcV/TmMFD3+rKBNs9VZUG8/d/59iBLNwmEPYsOyXcDDbt+yNDpzhQgFjXS0e1oJGPJl2w== X-Received: by 2002:aa7:d84d:0:b0:508:470a:d5eb with SMTP id f13-20020aa7d84d000000b00508470ad5ebmr4605987eds.17.1682687661359; Fri, 28 Apr 2023 06:14:21 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:14:21 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda To: guix-patches@gnu.org Subject: [PATCH 2/3] gnu: maven-*-*: DRY add-missing-shebangs. Date: Fri, 28 Apr 2023 15:13:11 +0200 Message-Id: <20230428131312.4604-2-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Rostislav Svoboda X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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-shebangs`. --- gnu/packages/maven.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a3122bfa32..6990d091cf 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1354,6 +1354,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 _ + ;; -i, --in-place edit files in place + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + (define-public maven-settings-builder (package (inherit maven-artifact) @@ -1366,8 +1371,7 @@ (define-public maven-settings-builder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1400,8 +1404,7 @@ (define-public maven-model-builder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'configure 'chdir (lambda _ ;; Required for tests that rely on the package's default @@ -1508,8 +1511,7 @@ (define-public maven-resolver-provider #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1601,8 +1603,7 @@ (define-public maven-core-bootstrap #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core @@ -1835,8 +1836,7 @@ (define-public maven-embedder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 09:15:00 2023 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:15:00 +0000 Received: from localhost ([127.0.0.1]:60756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNwB-0008LW-OF for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:15:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:34374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNw9-0008LH-PQ for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:58 -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 1psNvs-0003rq-Ro for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:42 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNvp-0008GR-3r for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:38 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5067736607fso17116895a12.0 for ; Fri, 28 Apr 2023 06:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687670; x=1685279670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jn7y9jPu8hHantJH2XCzrIJUPJc/I7LifVXznR6yIKw=; b=Ky0cBJap6QYPwY54jgfiyrQ0E0A97dCBAJPZqorSYNyCqu6RrQO7G2wKAF42j5gj6h OPxNMw1dV7kMToe2rN1nNP5lspkVnw/rB7560NgTFp7O5f8e/kPlYe+dxrAfNRd55JA1 r8Rpb7YfYXtmuHIzwVEND6SlKMNroj5DNqVMQaD6GLA70jfciHzcekt60VAfFexDCwEp FTmzxK5uAeGSaxZ7FUbvTvpmJ1Yi8pf2X8kVQjKHvwm79yPjZNxH0AZOkcaC1ICylS6F 0mkg/YxnEXA9sH39Qps6YeWuPkzl7uzWsF/niYO9hcj8CYk645ZwAnevsMtLGVhfVRtE V19A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687670; x=1685279670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jn7y9jPu8hHantJH2XCzrIJUPJc/I7LifVXznR6yIKw=; b=MEdKoGO1tWfyhWWrcMHwApS4IQH/Zh0BmDNN+5jZ5tLoZEfkCUtXKNtmFiTiz+OdVQ udcoImpbZDlTgBjDvG72MbQIuNwDs7wBTxejMwRHt+r+hVWamXuXey4dxzpdYCmANHhi 7w+gXYIwPUdA4DpE2CzaKQvpCJWOdVAoTdOXEAMuSYmWITI0cSKdm1MPz/tA3LpMeMBw g5WpF4YPP5K8azIp7MS9GRfGaCFBBgiQvQPmBQEB1hgjfrcmLV49ihN23tBcLqnJyju5 cP0UGpC9LEz6hGVR2e/3bjCiO4UiaZOPylbtaJ2OeW1B5NdFoIGZOOI9tM3fMCUyKVyy S5QA== X-Gm-Message-State: AC+VfDzQJx0IJKNJT6LYNNewiUZDcDMYuOLVRwH8vYzSdsYQyGk7QgJ/ RtRKao0PGujzMiFTuiPkrkOIpDZcGPRsaA== X-Google-Smtp-Source: ACHHUZ4wdO1uLE2ViDr4gfPQl4ocdC/78kd2AULUbGae6byPtVq+HU1rbNf09lc7f1az7eCXB/mGDw== X-Received: by 2002:a05:6402:2029:b0:509:f31f:b570 with SMTP id ay9-20020a056402202900b00509f31fb570mr5050017edb.23.1682687669374; Fri, 28 Apr 2023 06:14:29 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:14:29 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda To: guix-patches@gnu.org Subject: [PATCH 3/3] gnu: maven-*-*: DRY generate-sisu-named. Date: Fri, 28 Apr 2023 15:13:12 +0200 Message-Id: <20230428131312.4604-3-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Rostislav Svoboda X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 `generate-sisu-named`. --- gnu/packages/maven.scm | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 6990d091cf..34a1fae4b5 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1359,6 +1359,14 @@ (define add-missing-shebang ;; -i, --in-place edit files in place (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) +(define* (generate-sisu-named sisu-path #:optional (src-path "")) + (let ((sisu-sh (string-append sisu-path "sisu.sh"))) + `(lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (chmod ,sisu-sh #o755) + (invoke ,sisu-sh ,(string-append src-path "src/main/java") + "build/classes/META-INF/sisu/javax.inject.Named")))) + (define-public maven-settings-builder (package (inherit maven-artifact) @@ -1373,11 +1381,7 @@ (define-public maven-settings-builder (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "sisu.sh" #o755) - (invoke "./sisu.sh" "maven-settings-builder/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named"))) + ,(generate-sisu-named "./" "maven-settings-builder/")) (replace 'install (install-from-pom "maven-settings-builder/pom.xml"))))) (propagated-inputs (list java-plexus-utils @@ -1416,11 +1420,7 @@ (define-public maven-model-builder "build/classes") #t)) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "../sisu.sh" #o755) - (invoke "../sisu.sh" "src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named"))) + ,(generate-sisu-named "../")) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs @@ -1513,12 +1513,7 @@ (define-public maven-resolver-provider (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "./sisu.sh" #o755) - (invoke "./sisu.sh" "maven-resolver-provider/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "./" "maven-resolver-provider/")) (replace 'install (install-from-pom "maven-resolver-provider/pom.xml"))))) (propagated-inputs @@ -1627,12 +1622,7 @@ (define-public maven-core-bootstrap (("\\$\\{distributionName\\}") "Apache Maven")) #t)) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "../sisu.sh" #o755) - (invoke "../sisu.sh" "src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "../")) (add-before 'build 'generate-models (lambda* (#:key inputs #:allow-other-keys) (define (modello-single-mode file version mode) @@ -1838,12 +1828,7 @@ (define-public maven-embedder (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "sisu.sh" #o755) - (invoke "./sisu.sh" "maven-embedder/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "./" "maven-embeder/")) (add-before 'build 'copy-resources (lambda _ (mkdir-p "build/classes/") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 16:31:09 2023 Received: (at 63145) by debbugs.gnu.org; 28 Apr 2023 20:31:09 +0000 Received: from localhost ([127.0.0.1]:34603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psUkF-0008Tg-GE for submit@debbugs.gnu.org; Fri, 28 Apr 2023 16:31:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psUkA-0008T7-50 for 63145@debbugs.gnu.org; Fri, 28 Apr 2023 16:31:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psUk4-0000l1-Jg; Fri, 28 Apr 2023 16:30:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=0OXfj4JxSRRqh5hyFe7zvlLPW2mXJejnoK2D2emslp4=; b=IHK6k6Vbwc5p4ykNsSc9 CJRyZALhIXI7HlwtfyFeMiAk+tptNGOKVYcTWT6s7UASjQbmwY30AkArNWbfPwppSOiVBaQ0WBRf8 cBblqq0bAXAAIcwoURfIZ4FggYjtVAvvmAMcHO6s8xuoaCYjDeqVM1SYl92fh2YJMk3mAZ1/Ywpaw 4ZOId0ZX9sVsxmsniaWXxuuhi17sHHqvROHXaTcvMb/I3W4cdnQ8YbyJsAHGTl/SbzDKgZcRD0wW9 4KcXP5byY5UEz7wJZFN70tlaK2ZwQM34OQeGzxkpIYZKl6YL5kiTcF1W1sycDagJdQ7TVHtI4yYmF GWVIFjr4VbfS7g==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psUk4-0000Wl-2N; Fri, 28 Apr 2023 16:30:56 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Rostislav Svoboda Subject: Re: bug#63145: [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> Date: Fri, 28 Apr 2023 22:30:53 +0200 In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> (Rostislav Svoboda's message of "Fri, 28 Apr 2023 15:13:10 +0200") Message-ID: <877ctvsq9u.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63145 Cc: 63145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Rostislav, I pushed patches minutes ago fixing the same thing: https://issues.guix.gnu.org/63094 They lack the nice factorization that you add, but they use =E2=80=98substitute*=E2=80=99 instead of calling out to =E2=80=98sed=E2=80= =99, which is the preferred way to do it. We could definitely factorize along the lines of what you propose. Would you like to update these two patches? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 29 06:25:31 2023 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: Subject: Re: bug#63145: [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: multipart/mixed; boundary="000000000000c9e3cf05fa77012c" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63145 Cc: 63145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000c9e3cf05fa77012c Content-Type: text/plain; charset="UTF-8" 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 --000000000000c9e3cf05fa77012c Content-Type: text/x-patch; charset="US-ASCII"; name="0002-gnu-maven-DRY-generate-sisu-named.patch" Content-Disposition: attachment; filename="0002-gnu-maven-DRY-generate-sisu-named.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lh1u5mdf0 RnJvbSA1NGM3MGQxZWE3MTMwYmVkZDVmZGE0MzE3YTc2YWQ1NTQ2ZTg5MzQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb3N0aXNsYXYgU3ZvYm9kYSA8Um9zdGlzbGF2LlN2b2JvZGFA Z21haWwuY29tPgpEYXRlOiBTYXQsIDI5IEFwciAyMDIzIDEyOjAxOjAxICswMjAwClN1YmplY3Q6 IFtQQVRDSCAyLzJdIGdudTogbWF2ZW4tKi0qOiBEUlkgZ2VuZXJhdGUtc2lzdS1uYW1lZC4KCiog Z251L3BhY2thZ2VzL21hdmVuLnNjbQogIC0gbWF2ZW4tc2V0dGluZ3MtYnVpbGRlcgogIC0gbWF2 ZW4tbW9kZWwtYnVpbGRlcgogIC0gbWF2ZW4tcmVzb2x2ZXItcHJvdmlkZXIKICAtIG1hdmVuLWNv cmUtYm9vdHN0cmFwCiAgLSBtYXZlbi1lbWJlZGRlcgogIEltcGxlbWVudCBjb21tb24gZnVuY3Rp b25hbGl0eSBqdXN0IG9uY2UgaW4gdGhlIGBnZW5lcmF0ZS1zaXN1LW5hbWVkYC4KLS0tCiBnbnUv cGFja2FnZXMvbWF2ZW4uc2NtIHwgMzQgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9tYXZlbi5zY20gYi9nbnUvcGFja2FnZXMvbWF2ZW4uc2Nt CmluZGV4IDhjNDRlNjhkMzEuLjUxZmJlNWFlNTQgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9t YXZlbi5zY20KKysrIGIvZ251L3BhY2thZ2VzL21hdmVuLnNjbQpAQCAtMTM2MSw2ICsxMzYxLDE0 IEBAIChkZWZpbmUgYWRkLW1pc3Npbmctc2hlYmFuZwogICAgICAoc3Vic3RpdHV0ZSogInNpc3Uu c2giCiAgICAgICAgKCgiXiMjIFQiKSAiIyEvYmluL3NoXG4jIyBUIikpKSkKIAorKGRlZmluZSog KGdlbmVyYXRlLXNpc3UtbmFtZWQgc2lzdS1wYXRoICM6b3B0aW9uYWwgKHNyYy1wYXRoICIiKSkK KyAgKGxldCAoKHNpc3Utc2ggKHN0cmluZy1hcHBlbmQgc2lzdS1wYXRoICJzaXN1LnNoIikpKQor ICAgIGAobGFtYmRhIF8KKyAgICAgICAobWtkaXItcCAiYnVpbGQvY2xhc3Nlcy9NRVRBLUlORi9z aXN1IikKKyAgICAgICAoY2htb2QgICxzaXN1LXNoICNvNzU1KQorICAgICAgIChpbnZva2UgLHNp c3Utc2ggLChzdHJpbmctYXBwZW5kIHNyYy1wYXRoICJzcmMvbWFpbi9qYXZhIikKKyAgICAgICAg ICAgICAgICJidWlsZC9jbGFzc2VzL01FVEEtSU5GL3Npc3UvamF2YXguaW5qZWN0Lk5hbWVkIikp KSkKKwogKGRlZmluZS1wdWJsaWMgbWF2ZW4tc2V0dGluZ3MtYnVpbGRlcgogICAocGFja2FnZQog ICAgIChpbmhlcml0IG1hdmVuLWFydGlmYWN0KQpAQCAtMTM3NCwxMSArMTM4Miw3IEBAIChkZWZp bmUtcHVibGljIG1hdmVuLXNldHRpbmdzLWJ1aWxkZXIKICAgICAgICAobW9kaWZ5LXBoYXNlcyAl c3RhbmRhcmQtcGhhc2VzCiAgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2FkZC1zaXN1LXNo ZWJhbmcgLGFkZC1taXNzaW5nLXNoZWJhbmcpCiAgICAgICAgICAoYWRkLWJlZm9yZSAnYnVpbGQg J2dlbmVyYXRlLXNpc3UtbmFtZWQKLSAgICAgICAgICAgKGxhbWJkYSBfCi0gICAgICAgICAgICAg KG1rZGlyLXAgImJ1aWxkL2NsYXNzZXMvTUVUQS1JTkYvc2lzdSIpCi0gICAgICAgICAgICAgKGNo bW9kICJzaXN1LnNoIiAjbzc1NSkKLSAgICAgICAgICAgICAoaW52b2tlICIuL3Npc3Uuc2giICJt YXZlbi1zZXR0aW5ncy1idWlsZGVyL3NyYy9tYWluL2phdmEiCi0gICAgICAgICAgICAgICAgICAg ICAiYnVpbGQvY2xhc3Nlcy9NRVRBLUlORi9zaXN1L2phdmF4LmluamVjdC5OYW1lZCIpKSkKKyAg ICAgICAgICAgLChnZW5lcmF0ZS1zaXN1LW5hbWVkICIuLyIgIm1hdmVuLXNldHRpbmdzLWJ1aWxk ZXIvIikpCiAgICAgICAgICAocmVwbGFjZSAnaW5zdGFsbCAoaW5zdGFsbC1mcm9tLXBvbSAibWF2 ZW4tc2V0dGluZ3MtYnVpbGRlci9wb20ueG1sIikpKSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRz CiAgICAgIChsaXN0IGphdmEtcGxleHVzLXV0aWxzCkBAIC0xNDE2LDExICsxNDIwLDcgQEAgKGRl ZmluZS1wdWJsaWMgbWF2ZW4tbW9kZWwtYnVpbGRlcgogICAgICAgICAgICAgICN0KSkKICAgICAg ICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnYWRkLXNpc3Utc2hlYmFuZyAsYWRkLW1pc3Npbmctc2hl YmFuZykKICAgICAgICAgIChhZGQtYmVmb3JlICdidWlsZCAnZ2VuZXJhdGUtc2lzdS1uYW1lZAot ICAgICAgICAgICAobGFtYmRhIF8KLSAgICAgICAgICAgICAobWtkaXItcCAiYnVpbGQvY2xhc3Nl cy9NRVRBLUlORi9zaXN1IikKLSAgICAgICAgICAgICAoY2htb2QgIi4uL3Npc3Uuc2giICNvNzU1 KQotICAgICAgICAgICAgIChpbnZva2UgIi4uL3Npc3Uuc2giICJzcmMvbWFpbi9qYXZhIgotICAg ICAgICAgICAgICAgICAgICAgImJ1aWxkL2NsYXNzZXMvTUVUQS1JTkYvc2lzdS9qYXZheC5pbmpl Y3QuTmFtZWQiKSkpCisgICAgICAgICAgICwoZ2VuZXJhdGUtc2lzdS1uYW1lZCAiLi4vIikpCiAg ICAgICAgICAocmVwbGFjZSAnaW5zdGFsbAogICAgICAgICAgICAoaW5zdGFsbC1mcm9tLXBvbSAi cG9tLnhtbCIpKSkpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwpAQCAtMTUxMiwxMiArMTUxMiw3 IEBAIChkZWZpbmUtcHVibGljIG1hdmVuLXJlc29sdmVyLXByb3ZpZGVyCiAgICAgICAgKG1vZGlm eS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwogICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdh ZGQtc2lzdS1zaGViYW5nICxhZGQtbWlzc2luZy1zaGViYW5nKQogICAgICAgICAgKGFkZC1iZWZv cmUgJ2J1aWxkICdnZW5lcmF0ZS1zaXN1LW5hbWVkCi0gICAgICAgICAgIChsYW1iZGEgXwotICAg ICAgICAgICAgIChta2Rpci1wICJidWlsZC9jbGFzc2VzL01FVEEtSU5GL3Npc3UiKQotICAgICAg ICAgICAgIChjaG1vZCAiLi9zaXN1LnNoIiAjbzc1NSkKLSAgICAgICAgICAgICAoaW52b2tlICIu L3Npc3Uuc2giICJtYXZlbi1yZXNvbHZlci1wcm92aWRlci9zcmMvbWFpbi9qYXZhIgotICAgICAg ICAgICAgICAgICAgICAgImJ1aWxkL2NsYXNzZXMvTUVUQS1JTkYvc2lzdS9qYXZheC5pbmplY3Qu TmFtZWQiKQotICAgICAgICAgICAgICN0KSkKKyAgICAgICAgICAgLChnZW5lcmF0ZS1zaXN1LW5h bWVkICIuLyIgIm1hdmVuLXJlc29sdmVyLXByb3ZpZGVyLyIpKQogICAgICAgICAgKHJlcGxhY2Ug J2luc3RhbGwKICAgICAgICAgICAgKGluc3RhbGwtZnJvbS1wb20gIm1hdmVuLXJlc29sdmVyLXBy b3ZpZGVyL3BvbS54bWwiKSkpKSkKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKQEAgLTE4MzUsMTIg KzE4MzAsNyBAQCAoZGVmaW5lLXB1YmxpYyBtYXZlbi1lbWJlZGRlcgogICAgICAgIChtb2RpZnkt cGhhc2VzICVzdGFuZGFyZC1waGFzZXMKICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnYWRk LXNpc3Utc2hlYmFuZyAsYWRkLW1pc3Npbmctc2hlYmFuZykKICAgICAgICAgIChhZGQtYmVmb3Jl ICdidWlsZCAnZ2VuZXJhdGUtc2lzdS1uYW1lZAotICAgICAgICAgICAobGFtYmRhIF8KLSAgICAg ICAgICAgICAobWtkaXItcCAiYnVpbGQvY2xhc3Nlcy9NRVRBLUlORi9zaXN1IikKLSAgICAgICAg ICAgICAoY2htb2QgInNpc3Uuc2giICNvNzU1KQotICAgICAgICAgICAgIChpbnZva2UgIi4vc2lz dS5zaCIgIm1hdmVuLWVtYmVkZGVyL3NyYy9tYWluL2phdmEiCi0gICAgICAgICAgICAgICAgICAg ICAiYnVpbGQvY2xhc3Nlcy9NRVRBLUlORi9zaXN1L2phdmF4LmluamVjdC5OYW1lZCIpCi0gICAg ICAgICAgICAgI3QpKQorICAgICAgICAgICAsKGdlbmVyYXRlLXNpc3UtbmFtZWQgIi4vIiAibWF2 ZW4tZW1iZWRlci8iKSkKICAgICAgICAgIChhZGQtYmVmb3JlICdidWlsZCAnY29weS1yZXNvdXJj ZXMKICAgICAgICAgICAgKGxhbWJkYSBfCiAgICAgICAgICAgICAgKG1rZGlyLXAgImJ1aWxkL2Ns YXNzZXMvIikKLS0gCjIuMzkuMgoK --000000000000c9e3cf05fa77012c Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-maven-DRY-add-missing-shebang.patch" Content-Disposition: attachment; filename="0001-gnu-maven-DRY-add-missing-shebang.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lh1u5me21 RnJvbSBmYjc3NzQ1MjU5MjRkNTliZjIxMmExMjIzMDFhYTQ3NzY2ZjUzYjBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb3N0aXNsYXYgU3ZvYm9kYSA8Um9zdGlzbGF2LlN2b2JvZGFA Z21haWwuY29tPgpEYXRlOiBTYXQsIDI5IEFwciAyMDIzIDExOjU2OjI0ICswMjAwClN1YmplY3Q6 IFtQQVRDSCAxLzJdIGdudTogbWF2ZW4tKi0qOiBEUlkgYWRkLW1pc3Npbmctc2hlYmFuZy4KCiog Z251L3BhY2thZ2VzL21hdmVuLnNjbQogIC0gbWF2ZW4tc2V0dGluZ3MtYnVpbGRlcgogIC0gbWF2 ZW4tbW9kZWwtYnVpbGRlcgogIC0gbWF2ZW4tcmVzb2x2ZXItcHJvdmlkZXIKICAtIG1hdmVuLWNv cmUtYm9vdHN0cmFwCiAgLSBtYXZlbi1lbWJlZGRlcgogIEltcGxlbWVudCBjb21tb24gZnVuY3Rp b25hbGl0eSBqdXN0IG9uY2UgaW4gdGhlIGBhZGQtbWlzc2luZy1zaGViYW5nYC4KLS0tCiBnbnUv cGFja2FnZXMvbWF2ZW4uc2NtIHwgMzEgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2dudS9wYWNrYWdlcy9tYXZlbi5zY20gYi9nbnUvcGFja2FnZXMvbWF2ZW4uc2NtCmlu ZGV4IGE4MDViZGE4ZTUuLjhjNDRlNjhkMzEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9tYXZl bi5zY20KKysrIGIvZ251L3BhY2thZ2VzL21hdmVuLnNjbQpAQCAtNSw2ICs1LDcgQEAKIDs7OyBD b3B5cmlnaHQgwqkgMjAyMCBFZnJhaW0gRmxhc2huZXIgPGVmcmFpbUBmbGFzaG5lci5jby5pbD4K IDs7OyBDb3B5cmlnaHQgwqkgMjAyMiBBcnR5b20gVi4gUG9wdHNvdiA8cG9wdHNvdi5hcnR5b21A Z21haWwuY29tPgogOzs7IENvcHlyaWdodCDCqSAyMDIzIEFsZWtzYW5kciBWaXR5YXpldiA8YXZp dHlhemV3QGdtYWlsLmNvbT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBSb3N0aXNsYXYgU3ZvYm9k YSA8Um9zdGlzbGF2LlN2b2JvZGFAZ21haWwuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBh cnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTEzNTUsNiArMTM1NiwxMSBAQCAoZGVmaW5lLXB1Ymxp YyBtYXZlbi1zZXR0aW5ncwogdG9vbC4gIFRoaXMgcGFja2FnZSBjb250YWlucyBzdHJpY3RseSB0 aGUgbW9kZWwgZm9yIE1hdmVuIHNldHRpbmdzLCB0aGF0IGlzCiBzaW1wbHkgcGxhaW4gamF2YSBv YmplY3RzLiIpKSkKIAorKGRlZmluZSBhZGQtbWlzc2luZy1zaGViYW5nCisgIGAobGFtYmRhIF8K KyAgICAgKHN1YnN0aXR1dGUqICJzaXN1LnNoIgorICAgICAgICgoIl4jIyBUIikgIiMhL2Jpbi9z aFxuIyMgVCIpKSkpCisKIChkZWZpbmUtcHVibGljIG1hdmVuLXNldHRpbmdzLWJ1aWxkZXIKICAg KHBhY2thZ2UKICAgICAoaW5oZXJpdCBtYXZlbi1hcnRpZmFjdCkKQEAgLTEzNjYsMTAgKzEzNzIs NyBAQCAoZGVmaW5lLXB1YmxpYyBtYXZlbi1zZXR0aW5ncy1idWlsZGVyCiAgICAgICAgIzp0ZXN0 LWRpciAibWF2ZW4tc2V0dGluZ3MtYnVpbGRlci9zcmMvdGVzdCIKICAgICAgICAjOnBoYXNlcwog ICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKLSAgICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnYWRkLXNpc3Utc2hlYmFuZwotICAgICAgICAgICAobGFtYmRhIF8KLSAgICAg ICAgICAgICAoc3Vic3RpdHV0ZSogInNpc3Uuc2giCi0gICAgICAgICAgICAgICAoKCJeIyMgVCIp ICIjIS9iaW4vc2hcbiMjIFQiKSkpKQorICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdhZGQt c2lzdS1zaGViYW5nICxhZGQtbWlzc2luZy1zaGViYW5nKQogICAgICAgICAgKGFkZC1iZWZvcmUg J2J1aWxkICdnZW5lcmF0ZS1zaXN1LW5hbWVkCiAgICAgICAgICAgIChsYW1iZGEgXwogICAgICAg ICAgICAgIChta2Rpci1wICJidWlsZC9jbGFzc2VzL01FVEEtSU5GL3Npc3UiKQpAQCAtMTQxMSwx MCArMTQxNCw3IEBAIChkZWZpbmUtcHVibGljIG1hdmVuLW1vZGVsLWJ1aWxkZXIKICAgICAgICAg ICAgICAoY29weS1yZWN1cnNpdmVseSAic3JjL21haW4vcmVzb3VyY2VzIgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJidWlsZC9jbGFzc2VzIikKICAgICAgICAgICAgICAjdCkpCi0g ICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2FkZC1zaXN1LXNoZWJhbmcKLSAgICAgICAgICAg KGxhbWJkYSBfCi0gICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJzaXN1LnNoIgotICAgICAgICAg ICAgICAgKCgiXiMjIFQiKSAiIyEvYmluL3NoXG4jIyBUIikpKSkKKyAgICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnYWRkLXNpc3Utc2hlYmFuZyAsYWRkLW1pc3Npbmctc2hlYmFuZykKICAgICAg ICAgIChhZGQtYmVmb3JlICdidWlsZCAnZ2VuZXJhdGUtc2lzdS1uYW1lZAogICAgICAgICAgICAo bGFtYmRhIF8KICAgICAgICAgICAgICAobWtkaXItcCAiYnVpbGQvY2xhc3Nlcy9NRVRBLUlORi9z aXN1IikKQEAgLTE1MTAsMTAgKzE1MTAsNyBAQCAoZGVmaW5lLXB1YmxpYyBtYXZlbi1yZXNvbHZl ci1wcm92aWRlcgogICAgICAgICM6dGVzdHM/ICNmOyBkZXBlbmRlbmN5IGxvb3Agb24gbWF2ZW4t Y29yZSAoQENvbXBvbmVudCBSZXBvc2l0b3J5U3lzdGVtKQogICAgICAgICM6cGhhc2VzCiAgICAg ICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAn dW5wYWNrICdhZGQtc2lzdS1zaGViYW5nCi0gICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAg ICAgIChzdWJzdGl0dXRlKiAic2lzdS5zaCIKLSAgICAgICAgICAgICAgICgoIl4jIyBUIikgIiMh L2Jpbi9zaFxuIyMgVCIpKSkpCisgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2FkZC1zaXN1 LXNoZWJhbmcgLGFkZC1taXNzaW5nLXNoZWJhbmcpCiAgICAgICAgICAoYWRkLWJlZm9yZSAnYnVp bGQgJ2dlbmVyYXRlLXNpc3UtbmFtZWQKICAgICAgICAgICAgKGxhbWJkYSBfCiAgICAgICAgICAg ICAgKG1rZGlyLXAgImJ1aWxkL2NsYXNzZXMvTUVUQS1JTkYvc2lzdSIpCkBAIC0xNjA0LDEwICsx NjAxLDcgQEAgKGRlZmluZS1wdWJsaWMgbWF2ZW4tY29yZS1ib290c3RyYXAKICAgICAgICAgICM6 dGVzdHM/ICNmCiAgICAgICAgICAjOnBoYXNlcwogICAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0 YW5kYXJkLXBoYXNlcwotICAgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2FkZC1zaXN1LXNo ZWJhbmcKLSAgICAgICAgICAgICAobGFtYmRhIF8KLSAgICAgICAgICAgICAgIChzdWJzdGl0dXRl KiAic2lzdS5zaCIKLSAgICAgICAgICAgICAgICAgKCgiXiMjIFQiKSAiIyEvYmluL3NoXG4jIyBU IikpKSkKKyAgICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdhZGQtc2lzdS1zaGViYW5nICxh ZGQtbWlzc2luZy1zaGViYW5nKQogICAgICAgICAgICAoYWRkLWJlZm9yZSAnY29uZmlndXJlICdj aGRpcgogICAgICAgICAgICAgIChsYW1iZGEgXwogICAgICAgICAgICAgICAgOzsgUmVxdWlyZWQg Zm9yIGdlbmVyYXRpbmcgY29tcG9uZW50cy54bWwgaW4gbWF2ZW4tY29yZQpAQCAtMTgzOSwxMCAr MTgzMyw3IEBAIChkZWZpbmUtcHVibGljIG1hdmVuLWVtYmVkZGVyCiAgICAgICAgIzpqZGsgLGlj ZWR0ZWEtOAogICAgICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJk LXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdhZGQtc2lzdS1zaGViYW5nCi0g ICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAic2lzdS5zaCIK LSAgICAgICAgICAgICAgICgoIl4jIyBUIikgIiMhL2Jpbi9zaFxuIyMgVCIpKSkpCisgICAgICAg ICAoYWRkLWFmdGVyICd1bnBhY2sgJ2FkZC1zaXN1LXNoZWJhbmcgLGFkZC1taXNzaW5nLXNoZWJh bmcpCiAgICAgICAgICAoYWRkLWJlZm9yZSAnYnVpbGQgJ2dlbmVyYXRlLXNpc3UtbmFtZWQKICAg ICAgICAgICAgKGxhbWJkYSBfCiAgICAgICAgICAgICAgKG1rZGlyLXAgImJ1aWxkL2NsYXNzZXMv TUVUQS1JTkYvc2lzdSIpCi0tIAoyLjM5LjIKCg== --000000000000c9e3cf05fa77012c-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 29 17:24:35 2023 Received: (at 63145) by debbugs.gnu.org; 29 Jun 2023 21:24:35 +0000 Received: from localhost ([127.0.0.1]:54163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEz7z-0007HW-A1 for submit@debbugs.gnu.org; Thu, 29 Jun 2023 17:24:35 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEz7w-0007HM-Fs for 63145@debbugs.gnu.org; Thu, 29 Jun 2023 17:24:33 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id E63BD20903; Thu, 29 Jun 2023 23:24:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 376CE8009D; Thu, 29 Jun 2023 23:24:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xjd_HdmskJ2Q; Thu, 29 Jun 2023 23:24:29 +0200 (CEST) Received: from [192.168.1.116] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 7F8B78009B; Thu, 29 Jun 2023 23:24:29 +0200 (CEST) Message-ID: Date: Thu, 29 Jun 2023 22:24:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [bug#63145] [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. Content-Language: en-US To: Rostislav Svoboda References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> From: Bruno Victal In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 63145 Cc: =?UTF-8?Q?Ludovic_Court=c3=a8s?= , 63145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) Hi Rostislav, On 2023-04-28 14:13, Rostislav Svoboda wrote: > * gnu/packages/maven.scm > - maven-settings-builder > - maven-model-builder > - maven-resolver-provider > - maven-core-bootstrap > - maven-embedder > The sisu.sh script must have a shebang on the first line, otherwise an > 'In execvp of ...: Exec format error' is indicated. I think there's something strange going on with the maven-3.0-… packages, as I'm getting: --8<---------------cut here---------------start------------->8--- ## Guix commit is 94ac93042f09b4ba68b7b64ed1feeebd3dab1ea4. $ ./pre-inst-env guix build maven-settings-builder@3.0 … phase `patch-generated-file-shebangs' succeeded after 0.0 seconds starting phase `generate-sisu-named' phase `generate-sisu-named' succeeded after 0.1 seconds starting phase `generate-components.xml' In execvp of ./components.sh: Exec format error error: in phase 'generate-components.xml': uncaught exception: %exception #<&invoke-error program: "./components.sh" arguments: ("maven-settings-builder/src/main/java" "build/classes/META-INF/plexus/components.xml") exit-status: 127 term-signal: #f stop-signal: #f> phase `generate-components.xml' failed after 0.0 seconds command "./components.sh" "maven-settings-builder/src/main/java" "build/classes/META-INF/plexus/components.xml" failed with status 127 builder for `/gnu/store/czr1iwlh0krl0qwskkg6s862x2r9shhy-maven-settings-builder-3.0.drv' failed with exit code 1 build of /gnu/store/czr1iwlh0krl0qwskkg6s862x2r9shhy-maven-settings-builder-3.0.drv failed … --8<---------------cut here---------------end--------------->8--- -- Furthermore, I consider that nonfree software must be eradicated. Cheers, Bruno.