Added DEBUG synchronous execution

This commit is contained in:
Brian Zalewski 2023-12-25 02:19:52 +00:00
parent 21b5b11aeb
commit 944ec27f3b
6 changed files with 150 additions and 63 deletions

View file

@ -977,32 +977,60 @@ userLogFolders() {
done
}
addZshEnv &
applyFontsToSystem &
applyLinuxConfSettings &
applyLinuxThemeFiles &
applyRootConfig &
applyWallpaper &
asdfPluginInstall &
configureNetworkManagerVPNProfiles &
configureSSHD &
dconfSettings &
decryptSSHKeys &
emscriptenInstall &
enableAutoUpdateDarwin &
ensureQtStyleOverride &
ensureSystemGemUpdated &
ensureZshShell &
gnomeExtensionSettings &
grubSettings &
installDockerRclonePlugin &
loadCronjobs &
macOSSettings &
makeLocalBinExecutable &
symlinkAnsibleRoles &
symlinkPython &
userLogFolders &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
logg info 'The DEBUG or DEBUG_MODE environment variable is set so the post-dotfile-application routine tasks will be run synchronously'
addZshEnv
applyFontsToSystem
applyLinuxConfSettings
applyLinuxThemeFiles
applyRootConfig
applyWallpaper
asdfPluginInstall
configureNetworkManagerVPNProfiles
configureSSHD
dconfSettings
decryptSSHKeys
emscriptenInstall
enableAutoUpdateDarwin
ensureQtStyleOverride
ensureSystemGemUpdated
ensureZshShell
gnomeExtensionSettings
grubSettings
installDockerRclonePlugin
loadCronjobs
macOSSettings
makeLocalBinExecutable
symlinkAnsibleRoles
symlinkPython
userLogFolders
else
addZshEnv &
applyFontsToSystem &
applyLinuxConfSettings &
applyLinuxThemeFiles &
applyRootConfig &
applyWallpaper &
asdfPluginInstall &
configureNetworkManagerVPNProfiles &
configureSSHD &
dconfSettings &
decryptSSHKeys &
emscriptenInstall &
enableAutoUpdateDarwin &
ensureQtStyleOverride &
ensureSystemGemUpdated &
ensureZshShell &
gnomeExtensionSettings &
grubSettings &
installDockerRclonePlugin &
loadCronjobs &
macOSSettings &
makeLocalBinExecutable &
symlinkAnsibleRoles &
symlinkPython &
userLogFolders &
wait
fi
wait
logg info 'Completed asynchronous post-dotfile-application routine'
logg info 'Completed post-dotfile-application routine'

View file

@ -369,13 +369,28 @@ ubuntuDashToDockFix() {
fi
}
bashItPlugins &
candyIconTweaks &
configureVNC &
moveGnomeAppsToShare &
preloadZsh &
removeShortcutsLinux &
removeUbuntuLogoBranding &
setDefaultBrowser &
ubuntuDashToDockFix &
wait
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
logg info 'The DEBUG or DEBUG_MODE environment variable is set so the post-install tasks will be run synchronously'
bashItPlugins
candyIconTweaks
configureVNC
moveGnomeAppsToShare
preloadZsh
removeShortcutsLinux
removeUbuntuLogoBranding
setDefaultBrowser
ubuntuDashToDockFix
else
bashItPlugins &
candyIconTweaks &
configureVNC &
moveGnomeAppsToShare &
preloadZsh &
removeShortcutsLinux &
removeUbuntuLogoBranding &
setDefaultBrowser &
ubuntuDashToDockFix &
wait
fi
logg success 'Finished running the post-install tasks'

View file

@ -124,7 +124,14 @@ addTemporaryIncludes
. /tmp/tmp-logg
. /tmp/tmp-profile
ensureFullDiskAccess
importCloudFlareCert
configureMacOSVNC
disconnectWarp
wait
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
logg info 'The DEBUG or DEBUG_MODE environment variable is set so the prepare tasks will be run synchronously'
importCloudFlareCert
configureMacOSVNC
disconnectWarp
else
importCloudFlareCert &
configureMacOSVNC &
disconnectWarp &
wait
fi

View file

@ -606,21 +606,38 @@ installBrewPackages() {
logg success 'Finished installing auxilary Homebrew packages'
}
allocateSwap &
configureGPG &
disableDStoreFileCreation &
enableDarkTransparentMode &
ensureUserGroup &
increaseMapCount &
installBrewPackages &
installDocker &
installJumpCloud &
removeLinuxBloatware &
setHostname &
setNtpServer &
setTimezone &
showNotificationCenter &
wait
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
logg info 'The DEBUG or DEBUG_MODE environment variable is set so preliminary system tweaks will be run synchronously'
allocateSwap
configureGPG
disableDStoreFileCreation
enableDarkTransparentMode
ensureUserGroup
increaseMapCount
installBrewPackages
installDocker
installJumpCloud
removeLinuxBloatware
setHostname
setNtpServer
setTimezone
showNotificationCenter
else
allocateSwap &
configureGPG &
disableDStoreFileCreation &
enableDarkTransparentMode &
ensureUserGroup &
increaseMapCount &
installBrewPackages &
installDocker &
installJumpCloud &
removeLinuxBloatware &
setHostname &
setNtpServer &
setTimezone &
showNotificationCenter &
wait
fi
logg success 'Successfully applied preliminary system tweaks'

View file

@ -69,16 +69,28 @@ updateTemplates() {
for TEMPLATE of {{ .qubes.templates | toString | replace "[" "" | replace "]" "" }}; do
if [ ! -f "/var/lib/qubes/vm-templates/$TEMPLATE" ]; then
logg info "Installing $TEMPLATE"
sudo qubes-dom0-update "qubes-template-$TEMPLATE" &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
sudo qubes-dom0-update "qubes-template-$TEMPLATE"
else
sudo qubes-dom0-update "qubes-template-$TEMPLATE" &
fi
fi
done
### Ensure unofficial templates are installed
for TEMPLATE_URL of {{ .qubes.templatesUnofficial | toString | replace "[" "" | replace "]" "" }}; do
installUnofficialTemplate "$TEMPLATE_URL" &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
installUnofficialTemplate "$TEMPLATE_URL"
else
installUnofficialTemplate "$TEMPLATE_URL" &
fi
done
installMirageFirewall &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
installMirageFirewall
else
installMirageFirewall &
fi
wait
logg success 'Finished installing TemplateVMs'

View file

@ -26,9 +26,17 @@ fedoraPasswordlessRoot() {
for TEMPLATE of {{ .qubes.templates | toString | replace "[" "" | replace "]" "" }}; do
if [[ "$TEMPLATE" == *'-minimal' ]]; then
if [[ "$TEMPLATE" == 'debian'* ]] || [[ "$TEMPLATE" == 'ubuntu'* ]]; then
debianPasswordlessRoot "$TEMPLATE" &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
debianPasswordlessRoot "$TEMPLATE"
else
debianPasswordlessRoot "$TEMPLATE" &
fi
elif [[ "$TEMPLATE" == 'fedora'* ]]; then
fedoraPasswordlessRoot "$TEMPLATE" &
if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
fedoraPasswordlessRoot "$TEMPLATE"
else
fedoraPasswordlessRoot "$TEMPLATE" &
fi
fi
fi
done