diff options
| author | Simon Rettberg | 2020-10-13 16:02:42 +0200 |
|---|---|---|
| committer | Your Name | 2020-10-13 16:02:42 +0200 |
| commit | d5d13c2053414b39d9e297edf3f9ef021b69d924 (patch) | |
| tree | c9fd1401e79f282787a4d3b42df88db0cf49c47f /core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons | |
| parent | [vmware-common] Hard-coded lookup table for hwversion (diff) | |
| download | mltk-d5d13c2053414b39d9e297edf3f9ef021b69d924.tar.gz mltk-d5d13c2053414b39d9e297edf3f9ef021b69d924.tar.xz mltk-d5d13c2053414b39d9e297edf3f9ef021b69d924.zip | |
[splashtool] Finish first working implementation
Adds icons, triggers their display at appropriate times.
Diffstat (limited to 'core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons')
| -rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons index 0fed8342..73e0efb1 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons @@ -38,10 +38,18 @@ mkdir -p "$DOWNLOAD_DEST" || { echo "Failed to create $DOWNLOAD_DEST"; exit 1; } # DOWNLOAD ALL ADDONS # if [ $# -eq 0 ]; then - [ -z "${SLX_ADDONS}" ] && { echo "No addons configured. Nothing to do :-)."; exit 0; } - for ADDON in ${SLX_ADDONS}; do - systemctl --no-block start "download-slx-addon@$ADDON.service" - done + if [ -z "${SLX_ADDONS}" ]; then + echo "No addons configured. Nothing to do :-)." + else + for ADDON in ${SLX_ADDONS}; do + # Use bg not --no-block so we can wait below + systemctl start "download-slx-addon@$ADDON.service" & + done + echo "Waiting for addon downloads to finish" + wait + fi + [ -n "$SLX_SPLASH" ] && splashtool --icon "/opt/openslx/icons/active/??-puzzle.ppm" + exit 0 fi ## # DOWNLOAD SINGLE ADDON |