From patchwork Sat Feb 25 17:21:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 26 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id 0RQQOBO9sVjrDwAAtiB/HQ for ; Sat, 25 Feb 2017 18:21:23 +0100 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 180B7403D6; Sat, 25 Feb 2017 18:21:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.5 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Sat, 25 Feb 2017 18:21:21 +0100 (CET) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5E4BF2C81B; Sat, 25 Feb 2017 17:21:21 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HBXs03l3 Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 9BF9B2C81B for ; Sat, 25 Feb 2017 17:21:17 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 25 Feb 2017 17:21:17 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 518A1402EF for ; Sat, 25 Feb 2017 18:21:16 +0100 (CET) Received: from mail-qk0-x235.google.com (mail-qk0-x235.google.com [IPv6:2607:f8b0:400d:c09::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Sat, 25 Feb 2017 18:21:16 +0100 (CET) Received: by mail-qk0-x235.google.com with SMTP id u188so46888202qkc.2 for ; Sat, 25 Feb 2017 09:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V+cgQVdE6kfevbOuN449aOTogEEm2rqiOi7wE+Xaitk=; b=HBXs03l31mMMiNCdWVq/SfdO03H/BHIxJFx8HPlb5Pm+U0shlOU57chiZnSyMR4yTh qLgHzFuMgC9A+djfEUr10TjuLVSEUqXgQgoZE4vOPxknbc2asGVJF7CuL3Dkulbr8Nd8 ZbR9umGJqSGftn2uutKtLIQKY0/o2055qp/yZrPIz1J2tFt24fZPH38UDm3O9CuF77Tf 8qPBR1xb3dmcWHuNWA+kqnmdc4BHhYJrxc5NXzhdI3uYL00Pr9hF2w9+fSH84GuCbtxi O36qC4MthfUSs4bMXlxnJtj6JqERjMtQenQzyq+F65VKf4gcVUHDKQxmN2limypPyjqx Fsdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V+cgQVdE6kfevbOuN449aOTogEEm2rqiOi7wE+Xaitk=; b=lYMnTvoGFkC5KJNTWR1KAfT2EQ2JruC8pkaSjsVZugXuVxr7ooo6GLX4uVwhslp1Nt r2dBTM+Zkw601UBHs5G5iGov2FATXY3Hb74/VpJEoQ9MPp4MRLTIr+AEQOlO24fOOPEL 6lJDdVUBA4EhZ58V123AH7ue5dHmLph1xE9cdGwMbjZxW1+EzCQPlB160YluQG/WRzj3 xf8wrBg4X52uyla9LvYLKS3EoOf1O7hMos6aRLiGhwPeR8Sar5nNn5yFki+dcYBvmCQO 7GULmkVXQx/3kx3A6GkrbY5ZFPHHjzMgWIpy4c15K2h4hmslRqRo6B8/Ug0RfCCZxLJF H1oA== X-Gm-Message-State: AMke39l4GyzNnNdIVU9po7akN68S3Om+mQskTC+/Aaop4q8XH3trGJ+hjNHOxT4iwGLbMQ== X-Received: by 10.55.22.219 with SMTP id 88mr1577782qkw.246.1488043275142; Sat, 25 Feb 2017 09:21:15 -0800 (PST) Received: from localhost.local (cpe-98-27-61-138.nc.res.rr.com. [98.27.61.138]) by smtp.gmail.com with ESMTPSA id 15sm7105057qkd.35.2017.02.25.09.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Feb 2017 09:21:14 -0800 (PST) From: Andrew Gregory To: pacman-dev@archlinux.org Date: Sat, 25 Feb 2017 12:21:16 -0500 Message-Id: <20170225172118.5780-3-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170225172118.5780-1-andrew.gregory.8@gmail.com> References: <20170225172118.5780-1-andrew.gregory.8@gmail.com> Subject: [pacman-dev] [PATCH 2/4] util/pkgbuild: manually set extglob X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Discussion list for pacman development Cc: Andrew Gregory Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" X-UID: 80 Status: X-Keywords: Content-Length: 817 extract_function_variable requires extglob; set it in case the caller hasn't. --- scripts/libmakepkg/util/pkgbuild.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 08b35f53..7074c8c5 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -74,6 +74,9 @@ extract_function_variable() { local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 + local reset_shopt="$(shopt -p extglob)" + shopt -s extglob + if (( isarray )); then printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2" else @@ -89,6 +92,8 @@ extract_function_variable() { r=0 done < <(grep_function "$funcname" "$attr_regex") + eval "$reset_shopt" + return $r }