From patchwork Mon Oct 5 18:24:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John A. Leuenhagen" X-Patchwork-Id: 1779 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 462C01B9B8104 for ; Mon, 5 Oct 2020 18:24:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,RCVD_IN_MSPIKE_H4=-0.01,RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001,T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.0.19] [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Mon, 5 Oct 2020 18:24:56 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id EF6161D39EC046; Mon, 5 Oct 2020 18:24:51 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=pass (2048-bit key) header.d=zlima12.com header.i=@zlima12.com header.b=jud2Nn3g Authentication-Results: orion.archlinux.org; dkim=pass (2048-bit key) header.d=zlima12.com header.i=@zlima12.com header.b=jud2Nn3g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zlima12.com; s=dkim; t=1601922287; bh=XbNRqW71fWObKP1dAZCCVd9A2edmWFhrTRMimiF4Ps4=; h=From:Subject:To:Date; b=jud2Nn3gC9fg8+h5nj5TbpItFRg3ax50NdH6CZQobNc5BwJAghTZ6J2hw8PIvaP9R zX4kVJsYgiyc+EaVnWu3CS5vRWaj3pTWK0/p3duZL40GZV8TzvOB0Ua9E6+FmibiWV Ode2UUKNkd1wyWm4lENhWPwtS2tuv4yYQBCJs4zLI/R37XMpelAZd3U4xIz9WykOqm yLnlUMOrBf3YhxO3Qg4Uz4YltrAPeG02G8aBo2I5k/6j4eR6XBIhCh2dDL8qKISI/b QRg3GlWztSdjB+arGPm+dPoBpZUCXp5nk9Ik770i1IcIc6c4cRCyxt2WMyBPxnFUzy UCM6uGYYHuKEw== From: "John A. Leuenhagen" Subject: [PATCH] pacdiff: automatically delete pacfile after viewing if identical To: pacman-contrib@lists.archlinux.org Autocrypt: addr=john@zlima12.com; keydata= mDMEXr5/uxYJKwYBBAHaRw8BAQdA0tFvcoIz8+9UtT4GeIL/SZ4pkyXlcSNWIAJfPaUbw5e0 JUpvaG4gQS4gTGV1ZW5oYWdlbiA8am9obkB6bGltYTEyLmNvbT6IlgQTFggAPhYhBLYjxKu7 JRJj9l2dwP2ekblaZgkEBQJevn+7AhsDBQkJZgGABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA AAoJEP2ekblaZgkEnvYBAPODv8Wv4M/V9EmhjbAmVgTnKI6F+gJeZIM6bm4MTn8jAQCKIxAJ w4qbL4jCzyYepai7xb+qXtk7aoVZdBagSG/6D7g4BF6+f7sSCisGAQQBl1UBBQEBB0CKpIrr ccdqihcnsSzNqs9jE6GPih7BZrrVcRmOOoUXTQMBCAeIfgQYFggAJhYhBLYjxKu7JRJj9l2d wP2ekblaZgkEBQJevn+7AhsMBQkJZgGAAAoJEP2ekblaZgkElj4BAO2/vdyMB/Rn76/qOHvC kz4QSSlOQ+dey7rgHZl4ID7sAP4zVo+cSkwabU4lKjVGI1XmKtgsNkxIvkwy49xyR35iBg== Message-ID: <66d7ee9e-459b-679e-8df9-c7019b9514f2@zlima12.com> Date: Mon, 5 Oct 2020 14:24:47 -0400 MIME-Version: 1.0 Content-Language: en-US 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: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Signed-off-by: John A. Leuenhagen --- src/pacdiff.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index e3b8f8c..af85abb 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -184,6 +184,11 @@ while IFS= read -u 3 -r -d '' pacfile; do o|O) mv -v "$pacfile" "$file"; break ;; v|V) $diffprog "$pacfile" "$file" + if cmp -s "$pacfile" "$file"; then + msg2 "Files are identical, removing..." + rm -v "$pacfile" + break + fi ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type"; continue ;; s|S) break ;;