From patchwork Thu Mar 4 11:55:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1879 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.16) for (single-drop); Thu, 04 Mar 2021 11:56:03 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id dIW7NtLKQGCi8wgAK+/4rw (envelope-from ) for ; Thu, 04 Mar 2021 11:56:02 +0000 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (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 4F9E844316C; Thu, 4 Mar 2021 11:56:02 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 01E532D881; Thu, 4 Mar 2021 11:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1614858962; bh=UCdn//8zkgRkQgXWQWPi59ZgymJpltPpwFVYGsYkC60=; 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=V/ZzJnNBpt19wjDrNJEcorGSMo49Prm1ui6aED+5nN48knz+yHU/Qlu2pFnTwNdzr NELv9yNOZkiiVzI9trG4TO3TlwR2zC5tUYG10eArM/XHyvDGeDJP0kfvJsPmlCx2tT 8kR7wASuwjJaF6ivSupK1cHv18TmxIuRbV8aDOtc8/34OCn07wFqbzmodYrPYuB7Vs OKEIen0TGDEvDSR4TIDdIVezOHUJRzciJ4QDuuRrJChUmeHkFRo3Uq8IcZhn3SN2Gm NOG80oHBwxxAtq4NsJSF2ukNJYBjZqCDsUYhSaUkp1MaZTPe5RgGPlGW9KC8vQBl5V 7yJxJCl16yVY/KEbAwnNzal9/Mwo4BS4P2Qthnoc5IscOTGMZS66mmzJd+z1IF8INd Gi/rAaEKCUVTKV7riBZpICdNUb7UXUoMIKv5LoFbJng8ZnXwwvOu2e8YMBv/cDle+i n0Q3Dkley76ajvGH/Apls0j6wvPjYg0T4yqzTFsdvK24gs1n6A3DqupLoUfGFZdNnb Lgz7yQYlUFEI3lt88ZXzRQsRqxMvGPQON/EjJTJMoxU4LfFnBHF0biPMGdEZA8Y5YL SCag3NetzEGs6tVvu1kI5UkRcGn8pthPJG0QMGahcx2AbyHaHXmPOzzfMAZ6bKV61a 1jjNfzK8tbdnBF3xcccLpH2o= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D9EB92D86E for ; Thu, 4 Mar 2021 11:55:58 +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-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 4 Mar 2021 11:55:58 +0000 (UTC) Received: by mail-pj1-x1035.google.com with SMTP id e9so6405470pjs.2 for ; Thu, 04 Mar 2021 03:55:58 -0800 (PST) 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=3i+zwzvZJMj57A4rBwkSpU5BsKMVZ8k9KLCR+jwwEnc=; b=YaxjeYC743vSFMAvAal0rEefM23UvYkqQgl8nG/KdPqEjDgwSSMiu0JaXvy2SiIfZo o5xeHikWEJCbKOZGf761DPuQMZELVWqsAWJICH8NqLjwwCwDSn1rYqkjgTmbFXp4EIMJ M/h2c2qrYEPaoVshxek9UXf+hX8ZPyp6iGlnNFX11P+0hvPk3xENYYFI+bgvTtH51Oob PdB1lDlrhdrVjrTwK0JbAPhk8K8gg3sJmZbFOPYRbKpfjP/BiWR0kmUDEt76CLJ3bkOH z5a/dnsnBCuAFFBFxVfqejMBEvbfwq8qWn/zPLWktVHGKRS7OzhXCkVFot17yPRF9sJf LfNQ== X-Gm-Message-State: AOAM532/DhGwCqBsF9dTKMeb+EQWAuevlWriGTRHCimwxsMwklAVzx9K +QmjBLQNyJlH0Ti0BdXa/wmT9yf9I1s= X-Google-Smtp-Source: ABdhPJxbYEyS3+Dk6aVB2AsFM6/NvqIbjgTnQrHqQYyY0VW8G+5TcNjij01+0DdoYnh2WDDPKeCvEQ== X-Received: by 2002:a17:903:189:b029:e5:d7c3:a264 with SMTP id z9-20020a1709030189b02900e5d7c3a264mr3660741plg.6.1614858956307; Thu, 04 Mar 2021 03:55:56 -0800 (PST) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id 188sm27620300pfz.119.2021.03.04.03.55.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 03:55:55 -0800 (PST) To: pacman-contrib@lists.archlinux.org Subject: [PATCH v2 1/3] pacdiff: Implement die() Date: Thu, 4 Mar 2021 03:55:45 -0800 Message-Id: <4ddc2db0d4d19c414452067c51ca6a34136f519c.1614858901.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.rc1.228.gb75b4e4ce2 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="V/ZzJnNB"; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 5.9.250.164 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 4F9E844316C 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_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip4:5.9.250.164]; 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:5.9.0.0/16, 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 a future commit, we will be making more use of this function. For now, implement it and use it in the one place where it's applicable. Signed-off-by: Denton Liu --- src/pacdiff.sh.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index c4dbd89..46a5adf 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -34,6 +34,11 @@ declare -i USE_FIND=0 USE_LOCATE=0 USE_PACDB=0 OUTPUTONLY=0 # Import libmakepkg source "$LIBRARY"/util/message.sh +die() { + error "$@" + exit 1 +} + usage() { cat </dev/null && (( ! OUTPUTONLY )); then - error "Cannot find the $diffprog binary required for viewing differences." - exit 1 + die "Cannot find the $diffprog binary required for viewing differences." fi case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in