From patchwork Fri May 12 18:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 49973 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 ADE9A27BBF1; Fri, 12 May 2023 19:54:14 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 D5C8E27BBEE for ; Fri, 12 May 2023 19:54:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxXu0-0007Iw-3d; Fri, 12 May 2023 14:54:04 -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 1pxXty-0007HF-OL for guix-patches@gnu.org; Fri, 12 May 2023 14:54:02 -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 1pxXty-0007vJ-GQ for guix-patches@gnu.org; Fri, 12 May 2023 14:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxXty-0003ch-C4 for guix-patches@gnu.org; Fri, 12 May 2023 14:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63383] [PATCH v2 4/4] Use more file-append. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2023 18:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63383 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63383@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63383-submit@debbugs.gnu.org id=B63383.168391758413847 (code B ref 63383); Fri, 12 May 2023 18:54:02 +0000 Received: (at 63383) by debbugs.gnu.org; 12 May 2023 18:53:04 +0000 Received: from localhost ([127.0.0.1]:32992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxXt2-0003b6-82 for submit@debbugs.gnu.org; Fri, 12 May 2023 14:53:04 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:38686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxXsy-0003ZR-Pu for 63383@debbugs.gnu.org; Fri, 12 May 2023 14:53:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=PzZT4yNHmmaUw5W jYUsLhh1NuD3gUlVl/gqDgsJ5cpc=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=cGrvxHKzGJJ9rxqzBaN4Vaeb+CbvgoXiYVEd1i/+ t2pi9DE5WzKaVmCcfK4zqPmX6yimrRSD4cTjlCZ7hSK9NiVjgiMvg5PeT5Wlf5JHLQnwJM E3Unbs8uam6z0MZLcjVi1dixx0Lq6RJwCfc0c5IpQvggIK4M/VHJ3FCRIyr0Q= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id b22520eb (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 12 May 2023 18:52:56 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id eda3230f; Fri, 12 May 2023 18:52:55 +0000 (UTC) Date: Fri, 12 May 2023 11:52:50 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <1d5c51bdf283c808ff65a3cedbdd1078fb45a05b.1683917556.git.felix.lechner@lease-up.com> References: <1d5c51bdf283c808ff65a3cedbdd1078fb45a05b.1683917556.git.felix.lechner@lease-up.com> MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner 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 Based on the author's review of the code base as well as past commits, similar invocations are in the process of being changed over from string-append to file-append. * gnu/services/authentication.scm * gnu/services/base.scm * gnu/services/kerberos.scm * gnu/services/pam-mount.scm: Use more file-append instead of string-append. --- gnu/services/authentication.scm | 2 +- gnu/services/base.scm | 2 +- gnu/services/kerberos.scm | 4 ++-- gnu/services/pam-mount.scm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index f1ad1b1afe..fbfef2d3d0 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -504,7 +504,7 @@ (define (nslcd-shepherd-service config) (define (pam-ldap-pam-service config) "Return a PAM service for LDAP authentication." (define pam-ldap-module - #~(string-append #$(nslcd-configuration-nss-pam-ldapd config) + (file-append (nslcd-configuration-nss-pam-ldapd config) "/lib/security/pam_ldap.so")) (pam-extension (transformer diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5d0542b39d..a6c501e2c2 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -3253,7 +3253,7 @@ (define (greetd-pam-service config) (define optional-pam-mount (pam-entry (control "optional") - (module #~(string-append #$greetd-pam-mount "/lib/security/pam_mount.so")) + (module (file-append greetd-pam-mount "/lib/security/pam_mount.so")) (arguments '("disable_interactive")))) (list diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index 1a1b37f890..a6f540a9b6 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -432,8 +432,8 @@ (define (pam-krb5-pam-service config) (transformer (lambda (pam) (define pam-krb5-module - #~(string-append #$(pam-krb5-configuration-pam-krb5 config) - "/lib/security/pam_krb5.so")) + (file-append (pam-krb5-configuration-pam-krb5 config) + "/lib/security/pam_krb5.so")) (let ((pam-krb5-sufficient (pam-entry diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm index 21c34ddd61..afaa2704cd 100644 --- a/gnu/services/pam-mount.scm +++ b/gnu/services/pam-mount.scm @@ -87,7 +87,7 @@ (define (pam-mount-pam-service config) (define optional-pam-mount (pam-entry (control "optional") - (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) + (module (file-append pam-mount "/lib/security/pam_mount.so")))) (list (pam-extension (transformer