From: Alyssa Ross <hi@alyssa.is>
To: ~qaul/community@lists.sr.ht
Cc: Katharina Fey <kookie@spacekookie.de>,
	Alyssa Ross <hi@alyssa.is>
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>
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