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