From patchwork Mon May 22 07:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Kortkamp X-Patchwork-Id: 50218 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 CCF6B27BBEA; Mon, 22 May 2023 08:46:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 EAABB27BBE2 for ; Mon, 22 May 2023 08:46:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q10F2-0007rT-RM; Mon, 22 May 2023 03:46: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 1q10F1-0007rE-8b for guix-patches@gnu.org; Mon, 22 May 2023 03:46:03 -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 1q10F1-0004JH-0P for guix-patches@gnu.org; Mon, 22 May 2023 03:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q10F0-000830-4Z for guix-patches@gnu.org; Mon, 22 May 2023 03:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63639] [PATCH] gnu: password-store: Fix program name in usage and tmpdir. Resent-From: Tobias Kortkamp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 07:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63639@debbugs.gnu.org Cc: Tobias Kortkamp X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168474150630856 (code B ref -1); Mon, 22 May 2023 07:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 May 2023 07:45:06 +0000 Received: from localhost ([127.0.0.1]:33426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q10E5-00081c-VF for submit@debbugs.gnu.org; Mon, 22 May 2023 03:45:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:43222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q10E4-00081P-4r for submit@debbugs.gnu.org; Mon, 22 May 2023 03:45: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 1q10Dz-0007ID-OE for guix-patches@gnu.org; Mon, 22 May 2023 03:44:59 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q10Dx-0003xZ-Te for guix-patches@gnu.org; Mon, 22 May 2023 03:44:59 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-510f866ce78so517711a12.1 for ; Mon, 22 May 2023 00:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684741496; x=1687333496; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JaCGyWif4P+PYPOHlFL2PLOv1sG+nsvlD0RotoaGPso=; b=e4ZLXd8i/Jt6WBOCXUpuRm9I8xB01RwrnuBfXIsuh6bCkwFHTcV8ziXV57eWwnGFPM TUYsdDzq/Z3liESmRa2L7iTgdESHRg4EVF9O5wFUimoNqbNluGBOv3qKEvskF4DnXvtj OBVz/66pXsUzKK24BCrwc2CDvUwjIpGVktXPFXgnG4/4c9D3E3ytmrDlE2fyhJwuwtWm cMNSjyiPHBFBxRhuEct3xDY4E8+RYqjo2OHhDf5VDrcuaObHXCv1eg0Qovom5DWblB/b CYiMB+Aj4D/fy5aThaNriEGpGd50CXHOtGt2Me561igoquxoO5ZQQQKuyfNC7jjTrbRd aurw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684741496; x=1687333496; 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=JaCGyWif4P+PYPOHlFL2PLOv1sG+nsvlD0RotoaGPso=; b=WRu3LXraR6NSZIvThk0HyYxkSlNYwXhAaq8LkRB9o2LQzbNz8kkZCLw/ui1eLsNjv5 5fkGTqe20Hl5iKgsDx2Vj4fOIZJZooBKmnZJeZuzsStX/8VteqRVNaIMdAfiiDbY9so9 Z4yZSojPDwL6rd/QhC4te203uXspq0wZPatnbQHAODAIlWphenKDWWdfmbgT5y1Nn+vZ nnH1wYKcUhTA1FX/R1MVArtbXZkDE0/29fyUJxpUdYZqDOp5v+n3Nq1qZMssGcyl4X9J XX+wW7L7TLjq06u3/xMUqbWT7Tq8dl7qfggs6UhB3K2vzEMDv36ETkqLpoUYrWrI347q EPcQ== X-Gm-Message-State: AC+VfDwi+VAUxfF1NDZw6WlamdHIOijVcBcnx+YTffrLqz6ILzeLskcw AQ2br1t76DXUsBTyd0Bpc4RYp0ursDo= X-Google-Smtp-Source: ACHHUZ6S1/TVi5TyIYMd6dAav2rcuWS2+Q2iIStPTlaUsxvRV5irTjNmKEDg0kYEIhwGfKo4xQSAvA== X-Received: by 2002:a05:6402:4307:b0:506:c24e:667d with SMTP id m7-20020a056402430700b00506c24e667dmr7975396edc.4.1684741495612; Mon, 22 May 2023 00:44:55 -0700 (PDT) Received: from anubis.kortkamp.xyz (p200300ff7f008500873e7d05b0b76269.dip0.t-ipconnect.de. [2003:ff:7f00:8500:873e:7d05:b0b7:6269]) by smtp.gmail.com with ESMTPSA id a19-20020aa7d913000000b0050bde945c00sm2703748edr.78.2023.05.22.00.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:44:55 -0700 (PDT) From: Tobias Kortkamp Date: Mon, 22 May 2023 09:44:47 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=tobias.kortkamp@gmail.com; helo=mail-ed1-x535.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-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 * gnu/packages/password-utils.scm (password-store): Fix program name in usage and tmpdir. --- gnu/packages/password-utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) Hi, pass from password-store uses the wrong programn name in its usage. The program name is also used when creating temporary directories/files during 'pass edit'. It doesn't break anything though AFAICT, so this is purely a cosmetic issue: #+begin_src $ pass help [...] Usage: .pass-real init [--path=subfolder,-p subfolder] gpg-id... Initialize new password storage and use gpg-id for encryption. Selectively reencrypt existing passwords using new gpg-id. [...] #+end_src Thanks. base-commit: 849286ba66c96534bddc04df1a47d5692cbc977e diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f5f301308a..b4cd866514 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -563,6 +563,12 @@ (define-public password-store "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" extension-dir "}\"\n")))))) + (add-before 'install 'patch-program-name + ;; Use pass not .pass-real in tmpdir and cmd_usage + (lambda _ + (substitute* "src/password-store.sh" + (("^PROGRAM=.*$") + "PROGRAM=\"pass\"\n")))) (add-before 'install 'patch-passmenu-path ;; FIXME Wayland support requires ydotool and dmenu-wl packages ;; We are ignoring part of the script that gets executed if