From 2aa657d5efa937ae424cd021dfd222a148d4ad4c Mon Sep 17 00:00:00 2001 From: jpic Date: Sun, 26 Jan 2020 18:12:15 +0100 Subject: [PATCH] Refactor User.build --- podctl/visitors/user.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/podctl/visitors/user.py b/podctl/visitors/user.py index e8651c7..540a666 100644 --- a/podctl/visitors/user.py +++ b/podctl/visitors/user.py @@ -24,11 +24,11 @@ class User: def build(self, script): script.append(f''' - if buildah run $ctr -- id {self.uid}; then - i=$(buildah run $ctr -- id -n {self.uid}) - buildah run $ctr -- usermod --home-dir {self.home} --no-log-init {self.uid} $i + if {script._run('id ' + str(self.uid))}; then + i=$({script._run('id -n ' + str(self.uid))}) + {script._run('usermod --home-dir ' + self.home + ' --no-log-init ' + str(self.uid) + ' $i')} else - buildah run $ctr -- useradd --home-dir {self.home} --uid {self.uid} {self.username} + {script._run('useradd --home-dir ' + self.home + ' --uid ' + str(self.uid) + ' ' + self.username)} fi ''') # noqa self.user_created = True