From 06d5b6b0b38170e3686905f26e026b2542782477 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sun, 6 Jan 2019 18:17:58 -0500
Subject: [PATCH] Move theme symlink creation into a module

---
 appimg-builder/appimg-modules/setup-theme-symlinks |  9 +++++++++
 appimg-builder/basic-image.conf                    | 11 -----------
 appimg-builder/common.inc                          |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 appimg-builder/appimg-modules/setup-theme-symlinks

diff --git a/appimg-builder/appimg-modules/setup-theme-symlinks b/appimg-builder/appimg-modules/setup-theme-symlinks
new file mode 100644
index 0000000..2849ec6
--- /dev/null
+++ b/appimg-builder/appimg-modules/setup-theme-symlinks
@@ -0,0 +1,9 @@
+#
+# /opt/share is a tree that is mounted into realm from citadel
+#
+mkdir -p /opt/share
+ln -sf /opt/share/themes/Adapta /usr/share/themes/Adapta
+ln -sf /opt/share/themes/Adapta-Eta /usr/share/themes/Adapta-Eta
+ln -sf /opt/share/themes/Adapta-Nokto /usr/share/themes/Adapta-Nokto
+ln -sf /opt/share/themes/Adapta-Nokto-Eta /usr/share/themes/Adapta-Nokto-Eta
+ln -sf /opt/share/icons/Paper /usr/share/icons/Paper
diff --git a/appimg-builder/basic-image.conf b/appimg-builder/basic-image.conf
index 4562110..0307459 100644
--- a/appimg-builder/basic-image.conf
+++ b/appimg-builder/basic-image.conf
@@ -1,12 +1 @@
 PACKAGES="man manpages vim-nox iputils-ping tmux vifm gnome-terminal firefox nautilus eog evince unzip x264"
-POST_INSTALL_MODULES="setup_theme_symlinks"
-
-setup_theme_symlinks() {
-    mkdir -p /opt/share
-    ln -sf /opt/share/themes/Adapta /usr/share/themes/Adapta
-    ln -sf /opt/share/themes/Adapta-Eta /usr/share/themes/Adapta-Eta
-    ln -sf /opt/share/themes/Adapta-Nokto /usr/share/themes/Adapta-Nokto
-    ln -sf /opt/share/themes/Adapta-Nokto-Eta /usr/share/themes/Adapta-Nokto-Eta
-    ln -sf /opt/share/icons/Paper /usr/share/icons/Paper
-}
-
diff --git a/appimg-builder/common.inc b/appimg-builder/common.inc
index be9c7ec..20339bb 100644
--- a/appimg-builder/common.inc
+++ b/appimg-builder/common.inc
@@ -6,7 +6,7 @@ BASE_PACKAGES="debootstrap iproute2 less xz-utils sudo dbus libpam-systemd opens
 
 BASE_PRE_INSTALL_MODULES="utility-library configure-locale create-user set-hostname no-install-recommends write-apt-sources"
 
-BASE_POST_INSTALL_MODULES="loginctl-enable-linger configure-systemd install-configure-host0 install-launch-script"
+BASE_POST_INSTALL_MODULES="loginctl-enable-linger configure-systemd install-configure-host0 install-launch-script setup-theme-symlinks"
 
 trap "exit 1" TERM
 export TOP_PID=$$