Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mail-b.sr.ht (Postfix) with ESMTPS id A44DFFF204 for <~qaul/community@lists.sr.ht>; Sun, 31 May 2020 18:17:31 +0000 (UTC) Authentication-Results: mail-b.sr.ht; dkim=pass (2048-bit key) header.d=alyssa.is header.i=@alyssa.is header.b=M60FZzHw; dkim=fail reason="key not found in DNS" (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=QT6TV61K Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 62B595C00CD; Sun, 31 May 2020 14:17:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 31 May 2020 14:17:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=LQqN8bYqF4WMv6K6r1NTvHHwlc qIP15ET/t3wrKki9A=; b=M60FZzHwbDvnWPWXrk8kLIko/LV8Gnr0DK48WqCwXR /OqXX38Lyb1bjTHPooOfvOzS8UVA2RYeSz1VCxgckfOTPKfsYXVoFyu8cbdSt72w auwfelaTLqS42NQjP2fHzNrKBzYZqrHaB8CwWZIl7CxD/ySIxDqCF44L6813J25Q mR7KtEaf1IPM09N8cERNl78DycQsI1i2Ni66bPz1MPSVkAzKpixgM1byflS812K5 fcSGncLmqQQ+1ps50PD7J3ABaFXghJSUvDqMkMC51UI0O9RBX7kBnk2qBJTzKLBU +Sn+nsNBEJN6EmItR2RaruE5a6uAfZCubNIMGDTY/TVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=LQqN8bYqF4WMv6K6r 1NTvHHwlcqIP15ET/t3wrKki9A=; b=QT6TV61KQh4OB6ujZkm98cgV+CFM12B9C wxdSpFF1+mrkl7ASPTxCNSQeIoph101vO3WfTEysNoiCWZj1UIT4it2YDkWqXeQZ 0rretEGttCij6zZbzEj/IDaCwGKg18g1YaYlgMzNfNnXiW5cK2rDryqoZayv8C8i JuZsy5m1EoC50DokuDfQAahQfNHt9cNODh8x2bN4tjffLtoqHyWyOol+0y1Oc/kl axIh+xctvRvb274Xjg7NqzNREK3HEtolaNAoQaT6I3QhYhoZ4v7gkisOAEZ99C72 YYUq/701qC608rrLoKc4fyQPw4MUXeYqz8hrB6sN6LHqjoGkCad3g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeffedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhs qeenucggtffrrghtthgvrhhnpeffieejjeehjeeiudelvdevgeeivdeuieetieeuudeltd fhgedthedtueeuffehveenucffohhmrghinhepqhgruhhlrdhnvghtnecukfhppeejledr vdefhedrudduledrudelgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p4feb77c2.dip0.t-ipconnect.de [79.235.119.194]) by mail.messagingengine.com (Postfix) with ESMTPA id E490530618C1; Sun, 31 May 2020 14:17:30 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id E7C6C440; Sun, 31 May 2020 18:17:28 +0000 (UTC) From: Alyssa Ross To: ~qaul/community@lists.sr.ht Cc: Katharina Fey , Alyssa Ross Subject: [PATCH 1/2] clients/android: don't override USER in build.sh Date: Sun, 31 May 2020 18:17:01 +0000 Message-Id: <20200531181702.6226-1-hi@alyssa.is> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable USER is a standard global environment variable that contains the name of the current user. Previously, build.sh would reassign user to be the id of the current user. This would break podman, which uses $USER to find the name of the user to look up in /etc/subuid. Since environment variables are conventionally upper case, using lowercase variable names in scripts avoids the problem of overriding variables in the environment. --- clients/android/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/android/build.sh b/clients/android/build.sh index 44cba421..eb559798 100755 --- a/clients/android/build.sh +++ b/clients/android/build.sh @@ -2,18 +2,18 @@ =20 set -e =20 -BASEDIR=3D$(realpath $(dirname "$0")) -USER=3D$(id -u) -GROUP=3D$(id -g) +basedir=3D$(realpath $(dirname "$0")) +user=3D$(id -u) +group=3D$(id -g) =20 if [ $1 =3D "dev" ]; then echo "Attaching shell for repeated builds." echo "Don't invoke gradle yourself! Use 'client/android/.build_neste= d.sh' instead!" echo "Don't forget to run 'export USER=3D$USER GROUP=3D$GROUP'!" - docker run --rm -it -v $BASEDIR/../../:/qaul.net qaulnet/android-bui= ld-env /bin/bash + docker run --rm -it -v $basedir/../../:/qaul.net qaulnet/android-bui= ld-env /bin/bash =20 else echo "Running one-shot-build" - docker run --rm -it -v $BASEDIR/../../:/qaul.net qaulnet/android-bui= ld-env \ - /qaul.net/clients/android/.build_nested.sh $USER $GROUP + docker run --rm -it -v $basedir/../../:/qaul.net qaulnet/android-bui= ld-env \ + /qaul.net/clients/android/.build_nested.sh $user $group fi --=20 2.26.2