From ce0f23ff16ca3bab196bdcc77c6910ac8a01534b Mon Sep 17 00:00:00 2001 From: Adam Codega Date: Wed, 22 Dec 2021 10:33:35 -0500 Subject: [PATCH 1/4] Update header.sh Updated verbiage on using `prompt_user` versus `prompt_user_then_kill` for clarification on behavior. --- fragments/header.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fragments/header.sh b/fragments/header.sh index c41879d..e7f02e0 100644 --- a/fragments/header.sh +++ b/fragments/header.sh @@ -43,13 +43,19 @@ BLOCKING_PROCESS_ACTION=tell_user # - quit_kill told to quit twice, then it will be killed # Could be great for service apps, if they do not respawn # - silent_fail exit script without prompt or installation -# - prompt_user show a user dialog for each blocking process found -# abort after three attempts to quit -# (only if user accepts to quit the apps, otherwise -# the update is cancelled). +# - prompt_user show a user dialog for each blocking process found, +# user can choose "Quit and Update" or "Not Now". +# When "Quit and Update" is chosen, blocking process +# will be told to quit. Installomator will wait 30 seconds +# before checking again in case Save dialogs etc are being responded to. +# Installomator will abort if quitting after three tries does not succeed. +# "Not Now" will exit Installomator. # - prompt_user_then_kill # show a user dialog for each blocking process found, -# attempt to quit two times, kill the process finally +# user can choose "Quit and Update" or "Not Now". +# When "Quit and Update" is chosen, blocking process +# will be terminated. Installomator will abort if terminating +# after two tries does not succeed. "Not Now" will exit Installomator. # - prompt_user_loop # Like prompt-user, but clicking "Not Now", will just wait an hour, # and then it will ask again. @@ -57,11 +63,12 @@ BLOCKING_PROCESS_ACTION=tell_user # the scripts gets stuct in waiting until the hour has passed, # possibly blocking for other management actions in this time. # - tell_user User will be showed a notification about the important update, -# but user is only allowed to quit and continue, and then we +# but user is only allowed to Quit and Continue, and then we # ask the app to quit. # - tell_user_then_kill -# Show dialog 2 times, and if the quitting fails, the -# blocking processes will be killed. +# User will be showed a notification about the important update, +# but user is only allowed to Quit and Continue. If the quitting fails, +# the blocking processes will be terminated. # - kill kill process without prompting or giving the user a chance to save From c635a05debda129c1144206b07512557964743ad Mon Sep 17 00:00:00 2001 From: Adam Codega Date: Wed, 22 Dec 2021 10:44:04 -0500 Subject: [PATCH 2/4] Update README.md Updated verbiage on using `prompt_user` versus `prompt_user_then_kill` for clarification on behavior. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aef13c3..1f8a36b 100644 --- a/README.md +++ b/README.md @@ -227,12 +227,12 @@ There are eight options: - `ignore`: continue even when blocking processes are found. - `silent_fail`: exit script without prompt or installation. -- `prompt_user`: (default) show a user dialog for each blocking process found abort after three attempts to quit (only if user accepts to quit the apps, otherwise the update is cancelled). -- `prompt_user_then_kill`: show a user dialog for each blocking process found, attempt to quit two times, kill the process finally. +- `prompt_user`: (default) show a user dialog for each blocking process found, user can choose "Quit and Update" or "Not Now". When "Quit and Update" is chosen, blocking process will be told to quit. Installomator will wait 30 seconds before checking again in case Save dialogs etc are being responded to. Installomator will abort if quitting after three tries does not succeed. "Not Now" will exit Installomator. +- `prompt_user_then_kill`: show a user dialog for each blocking process found, user can choose "Quit and Update" or "Not Now". When "Quit and Update" is chosen, blocking process will be terminated. Installomator will abort if terminating after two tries does not succeed. "Not Now" will exit Installomator. - `prompt_user_loop`: Like prompt-user, but clicking "Not Now", will just wait an hour, and then it will ask again. -WARNING! It might block the MDM agent on the machine, as the scripts gets stuct in waiting until the hour has passed, possibly blocking for other management actions in this time. -- `tell_user`: User will be showed a notification about the important update, but user is only allowed to quit and continue, and then we ask the app to quit. -- `tell_user_then_kill`: Show dialog 2 times, and if the quitting fails, the blocking processes will be killed. +WARNING! It might block the MDM agent on the machine, as the script will not exit, it will pause until the hour has passed, possibly blocking for other management actions in this time. +- `tell_user`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue, and then we ask the app to quit. +- `tell_user_then_kill`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue. If the quitting fails, the blocking processes will be terminated. - `kill`: kill process without prompting or giving the user a chance to save. If any process was closed, Installomator will try to open the app again, after the update process is done. From 9a9d0ca9060977a4f48887e68b643082332b31ef Mon Sep 17 00:00:00 2001 From: Adam Codega Date: Wed, 22 Dec 2021 10:45:27 -0500 Subject: [PATCH 3/4] Update header.sh Also clarified `prompt_user_loop` --- fragments/header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/header.sh b/fragments/header.sh index e7f02e0..cea7939 100644 --- a/fragments/header.sh +++ b/fragments/header.sh @@ -60,7 +60,7 @@ BLOCKING_PROCESS_ACTION=tell_user # Like prompt-user, but clicking "Not Now", will just wait an hour, # and then it will ask again. # WARNING! It might block the MDM agent on the machine, as -# the scripts gets stuct in waiting until the hour has passed, +# the script will not exit, it will pause until the hour has passed, # possibly blocking for other management actions in this time. # - tell_user User will be showed a notification about the important update, # but user is only allowed to Quit and Continue, and then we From c60999ac7de161c0c43106a84deac478707504d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 Jan 2022 09:34:14 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53cba39..72a5ed5 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,7 @@ There are eight options: - `prompt_user_then_kill`: show a user dialog for each blocking process found, user can choose "Quit and Update" or "Not Now". When "Quit and Update" is chosen, blocking process will be terminated. Installomator will abort if terminating after two tries does not succeed. "Not Now" will exit Installomator. - `prompt_user_loop`: Like prompt-user, but clicking "Not Now", will just wait an hour, and then it will ask again. WARNING! It might block the MDM agent on the machine, as the script will not exit, it will pause until the hour has passed, possibly blocking for other management actions in this time. -- `tell_user`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue, and then we ask the app to quit. +- `tell_user`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue, and then we ask the app to quit. This is default. - `tell_user_then_kill`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue. If the quitting fails, the blocking processes will be terminated. - `kill`: kill process without prompting or giving the user a chance to save.