From patchwork Mon Mar 29 09:02:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1890 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Mon, 29 Mar 2021 09:28:45 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id uLfzLcydYWAYHgEAK+/4rw (envelope-from ) for ; Mon, 29 Mar 2021 09:28:44 +0000 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 344D04B8C2D; Mon, 29 Mar 2021 09:28:44 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5D5392C7A1; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1617010123; bh=mLDoC6XEQhAGBFBj2oeoYG+Zwfj1IGaDhUVPQvSujAw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=t4KKwXFa7jTsTTnwu8StyUwG+DjoGV6Eh7Rysqscc+LhDS2MUqNSfzaLr6NaCndr3 6bRYNIllLZrT+jTIW4qu/ZIGOsH0UGBO2ig93uogUgKG9+J5EP8xaxsGbvzrXtelWw F7yN98RapR6pKT/Z4dCAFxYlps5Ri9Cvp/X16KVZfIeKb1EIvAbo1QHhSli9+3YJpQ 6wVQf95MpCfAl69bXLjFqousIjMLLkSUd14t0qLOZZOqIf/hBl9yZEHxZX8fgsq7cL WZFCOsMcmloJB8GfTXPDKdxR/f/RHp3e8pNBSiSjoz/nwNXYJ4e9Ms+MWUDnTyr9Pl lh90/ipQ+MZCF13+XN9M0kUtbjA38dMB8+FjS/lXIZQrdDPIV5ZHeA97rmGMjMD27c 5cbo2RyIAGUI2jWWbkvkDoWhO94XXLXLL98Cu+pr64U99WkgTvZf7zWYZcKVUJjdE1 saisl1CWhobr5U3j+UaStb+TFR57nC5c+TChqX7QiTGbBuEvSitWlMSueOx85Ckoj2 v5P2mZNjug1XYn+F6COeL5OdEDvQ3o0sgPGdKK77gjL391ZxudfE8voRmrT1fL2mm5 XVStqoHbGz7A9QSKyGFKtylBNww55wpjMqxoKGx44HsjM5ZoOQgSey3EqMcl3CDwna 7+EnS/Xft8uBQ4fdI3uP1SfM= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id BEA382C61E for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=no autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.5.0] Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) Received: by mail-pl1-x636.google.com with SMTP id h20so4087256plr.4 for ; Mon, 29 Mar 2021 02:03:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MjLIhS6/P2bmXE9bUITiqTOirWGrIbxPWTj91JXjZlQ=; b=QkeQ2NVOW2K8mY91QlMcfryR2p84p7+r/JOIsWEfI7obwXZZ3RkMc557CsrovLEySM cxftzCIpT7vPkgWUHJc93Ec3q8cJTxeDRqToZeKobibKBxs2ZweDtnXCzIdOxhv4Ns+H V86pH1bEgTtguQstu+hMG5oWyDQlI3xq8puLZXXOqPKK2rhSWpf8amE40jQsvLDsn7hf FGwKlj6io01j8bgTRKfvurQiEyWMa8bV/8NKFd4wZbM4ENEBbuD3Pryvrfa0vT4uURgf liSKzK9o3FwfuFf1ju+E10827/6uWMCN2fKIJZO7QRuQZRGHYITclQhgfDzjEhlJMEbb mKMw== X-Gm-Message-State: AOAM5302MY42yQNk1TX+QqDlnkQzUrVBuhds/KBupOPiNGoEy3Mj+CmD JgfkIAM2xceRCTb0a7rrwkonvJmuohI= X-Google-Smtp-Source: ABdhPJwqLC6eDB5FCEEAx/kc6PW6u0KHBviYWRCye/QMS3tBBiDPY7oToiYxDEVCg1TicCb7eGoH3Q== X-Received: by 2002:a17:90a:9281:: with SMTP id n1mr25543209pjo.146.1617008585903; Mon, 29 Mar 2021 02:03:05 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h68sm16122545pfe.111.2021.03.29.02.03.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:03:05 -0700 (PDT) To: pacman-contrib@lists.archlinux.org Subject: [PATCH 3/4] pacdiff: update --sudo usages Date: Mon, 29 Mar 2021 02:02:42 -0700 Message-Id: <636e0fb2a256bc0fd97953aa39b7e3c06238965a.1617008556.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Denton Liu via pacman-contrib From: Denton Liu Reply-To: Discussion list for pacman-contrib development Cc: Denton Liu Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=t4KKwXFa; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 344D04B8C2D X-Spamd-Result: default: False [2.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the --sudo option was introduced. However, a corresponding entry was not included in the man page. Document it. Also, align the usage text in the program with its friends above. Signed-off-by: Denton Liu --- doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.txt index 592da72..12f786b 100644 --- a/doc/pacdiff.8.txt +++ b/doc/pacdiff.8.txt @@ -53,6 +53,9 @@ Options *-c, \--cachedir *:: Scan 'dir' instead as the pacman cache for 3-way merge base candidates. +*-s, \--sudo*:: + Use sudo to merge/remove files. + See Also -------- linkman:pacman[8], linkman:pacman.conf[5] diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 674892b..fe66a6e 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -60,7 +60,7 @@ General Options: --nocolor remove colors from output -c/--cachedir scan "dir" for 3-way merge base candidates. (default: read from @sysconfdir@/pacman.conf) - -s/--sudo use sudo to merge/remove files + -s/--sudo use sudo to merge/remove files Environment Variables: DIFFPROG override the merge program: (default: 'vim -d')