From patchwork Mon Jul 23 22:15:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 703 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 4FC945A6B32E for ; Mon, 23 Jul 2018 22:15:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo 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,T_DKIMWL_WL_HIGH=-0.01 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [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, 23 Jul 2018 22:15:44 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 58466C4BF2961; Mon, 23 Jul 2018 22:15:38 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Mon, 23 Jul 2018 22:15:38 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 25AF628EA7; Mon, 23 Jul 2018 22:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1532384138; bh=U6sTEZZa39dlE14B/8CO5Mh64aLSTSTkeqG//m8U3M8=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=Bea5hpmk2niUairlW4USuPpiMr2PLI2tg8Zz/ga/W96Iu+ljLfOHgg+ICtCA4h49x rvBrtkr+5+yVfGAmr7/Mo9W6bQwI+/GkXwN0CM3pH1xH2DytcK9N1xvCb8uu9a0BkG ZEBOiA2o9n0MjJN/0e9/bWZCi0+gPcnTIr2lCLUYQx5OPom165qS7Qx9O3MQSAnlYw /B5q7wdAWcjlnmLhK9WKzje/rsRhQwZV3MQi74pJrw3EG1Uk4DgabEnHVz3ZgEMjxK 5/C4XGDdXahclMRfifBm5qcK3vzVEMYxsJy9bHWwSHQosCW0roVY4xCxe5l9ZIfhgV NrOxeMBpRHuoLPKbBqOMA9CHAV3mWrGh9LtcUxaibW8c3peG1sXQ5E9o1i+FyxynZ6 dKTBhlv8DPVHpSKGMVSJPgdqJpiiu9LR3wMlmGWyZwFcKzXzLkHbrRmqchSfbVvehP 8dTUogRqNHgDsaVh/a/F9k+6XL8VgSUT5bzN4ILJKo6SxtOwEzeARqbPrLlikKZg9J LQkAZMWSDJHxDPDP4tvZo4Y3ZEqyKw4xml7065jP5Pc9w5VYDunBd6QVhD/96w3EWZ X4VkdXInN0D5jVbPcR/u0rj5u9Zv/x8ziOofzTiPAGuQ7Smz/UTuXQBi54cK0+DDhe CTK9SdNK+v/TyLGbff/yDhXU= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 0C89328938 for ; Mon, 23 Jul 2018 22:15:36 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 23 Jul 2018 22:15:35 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 341EAC4BF295E for ; Mon, 23 Jul 2018 22:15:29 +0000 (UTC) Received: from glundandra.iskrembilen.com (glundandra.iskrembilen.com [91.213.203.94]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Mon, 23 Jul 2018 22:15:29 +0000 (UTC) Received: from localhost (cm-84.211.56.98.getinternet.no [84.211.56.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by glundandra.iskrembilen.com (Postfix) with ESMTPSA id 597487FBD8; Tue, 24 Jul 2018 00:15:28 +0200 (CEST) To: arch-projects@archlinux.org Date: Tue, 24 Jul 2018 00:15:27 +0200 Message-Id: <20180723221527.12071-1-foxboron@archlinux.org> X-Mailer: git-send-email 2.18.0 Subject: [arch-projects] [devtools] [PATCH] Expand check_root keepenv variables X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Morten Linderud via arch-projects Reply-To: Arch Linux projects development discussion Cc: Morten Linderud , Morten Linderud Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" From: Morten Linderud makechrootpkg checks the environment for multiple variables before overwriting them with makepkg.conf configurations. Expand check_root with the variables makechrootpkg check for so we are capable of overwriting them when needed. Signed-off-by: Morten Linderud --- archbuild.in | 2 +- lib/archroot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archbuild.in b/archbuild.in index 1e5b582..6f22b12 100644 --- a/archbuild.in +++ b/archbuild.in @@ -39,7 +39,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH +check_root SOURCE_DATE_EPOCH SRCDEST SRCPKGDEST PKGDEST LOGDEST MAKEFLAGS PACKAGER # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/lib/archroot.sh b/lib/archroot.sh index f279603..82276e2 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -10,7 +10,7 @@ CHROOT_VERSION='v4' ## orig_argv=("$0" "$@") check_root() { - local keepenv=$1 + local keepenv=$(tr " " "," <<< $@) (( EUID == 0 )) && return if type -P sudo >/dev/null; then