From 9fa827ab04dbd7a091974e2afb58e3fcf7675a35 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 29 Jul 2019 15:40:52 +0200
Subject: [PATCH] osbuild-run: refactor into functions

Prepare for follow-up patches adding more functionality.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 osbuild-run | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/osbuild-run b/osbuild-run
index 641270b9..10b433c4 100755
--- a/osbuild-run
+++ b/osbuild-run
@@ -5,25 +5,38 @@ import subprocess
 import sys
 
 
-# ld.so.conf must exist, or `ldconfig` throws a warning
-subprocess.run(["touch", "/etc/ld.so.conf"], check=True)
-subprocess.run(["ldconfig"], check=True)
+def ldconfig():
+    # ld.so.conf must exist, or `ldconfig` throws a warning
+    subprocess.run(["touch", "/etc/ld.so.conf"], check=True)
+    subprocess.run(["ldconfig"], check=True)
 
-try:
-    subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
-except subprocess.CalledProcessError as error:
-    sys.stderr.write(error.stdout)
-    sys.exit(1)
 
-# generate /etc/pki/tls/certs/ca-bundle.crt
-os.makedirs("/etc/pki/ca-trust/extracted/pem")
-os.makedirs("/etc/pki/tls/certs")
-os.symlink("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", "/etc/pki/tls/certs/ca-bundle.crt")
-subprocess.run(["update-ca-trust"])
+def sysusers():
+    try:
+        subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
+    except subprocess.CalledProcessError as error:
+        sys.stderr.write(error.stdout)
+        sys.exit(1)
 
-# Allow systemd-tmpfiles to return non-0. Some packages want to create
-# directories owned by users that are not set up with systemd-sysusers.
-subprocess.run(["systemd-tmpfiles", "--create"])
 
-r = subprocess.run(sys.argv[1:])
-sys.exit(r.returncode)
+def update_ca_trust():
+    # generate /etc/pki/tls/certs/ca-bundle.crt
+    os.makedirs("/etc/pki/ca-trust/extracted/pem")
+    os.makedirs("/etc/pki/tls/certs")
+    os.symlink("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", "/etc/pki/tls/certs/ca-bundle.crt")
+    subprocess.run(["update-ca-trust"])
+
+
+def tmpfiles():
+    # Allow systemd-tmpfiles to return non-0. Some packages want to create
+    # directories owned by users that are not set up with systemd-sysusers.
+    subprocess.run(["systemd-tmpfiles", "--create"])
+
+if __name__ == "__main__":
+    ldconfig()
+    sysusers()
+    update_ca_trust()
+    tmpfiles()
+
+    r = subprocess.run(sys.argv[1:])
+    sys.exit(r.returncode)