Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update if statements and add to CatchAll test #115

Closed
wants to merge 1 commit into from
Closed

Update if statements and add to CatchAll test #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Setup-Your-Mac-via-Dialog.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2413,7 +2413,7 @@ function checkNetworkQualityConfigurations() {
dialogUpdateWelcome "infobox: **Connection:** \n- Download: \n$mbps Mbps \n\n**Estimates:** \n- ${configurationOneName}: \n$(printf '%dh:%dm:%ds\n' $((configurationOneEstimatedSeconds/3600)) $((configurationOneEstimatedSeconds%3600/60)) $((configurationOneEstimatedSeconds%60))) \n\n- ${configurationTwoName}: \n$(printf '%dh:%dm:%ds\n' $((configurationTwoEstimatedSeconds/3600)) $((configurationTwoEstimatedSeconds%3600/60)) $((configurationTwoEstimatedSeconds%60))) \n\n- ${configurationThreeName}: \n$(printf '%dh:%dm:%ds\n' $((configurationThreeEstimatedSeconds/3600)) $((configurationThreeEstimatedSeconds%3600/60)) $((configurationThreeEstimatedSeconds%60)))"

# If option to lock the continue button is set to true, enable the continue button now to let the user progress
if [[ "$lockContinueBeforeEstimations" = "true" ]]; then
if [[ "${lockContinueBeforeEstimations}" == "true" ]]; then
updateScriptLog "WELCOME DIALOG: Enabling Continue Button"
dialogUpdateWelcome "button1: enable"
fi
Expand Down Expand Up @@ -2467,7 +2467,10 @@ function checkNetworkQualityCatchAllConfiguration() {

updateScriptLog "SETUP YOUR MAC DIALOG: Network Quality Test: Started: $dlStartDate, Ended: $dlEndDate; Download: $mbps Mbps, Responsiveness: $dlResponsiveness"
dialogUpdateSetupYourMac "infobox: **Connection:** \n- Download: \n$mbps Mbps \n\n**Estimates:** \n- $(printf '%dh:%dm:%ds\n' $((configurationCatchAllEstimatedSeconds/3600)) $((configurationCatchAllEstimatedSeconds%3600/60)) $((configurationCatchAllEstimatedSeconds%60)))"

if [[ "${lockContinueBeforeEstimations}" == "true" ]]; then
updateScriptLog "WELCOME DIALOG: Enabling Continue Button"
dialogUpdateWelcome "button1: enable"
fi
}


Expand Down Expand Up @@ -2834,7 +2837,7 @@ elif [[ "${welcomeDialog}" == "userInput" ]]; then
echo "$welcomeJSON" > "$welcomeJSONFile"

# If option to lock the continue button is set to true, open welcome dialog with button 1 disabled
if [[ "$lockContinueBeforeEstimations" = "true" ]]; then
if [[ "${lockContinueBeforeEstimations}" == "true" ]]; then

updateScriptLog "WELCOME DIALOG: Display 'Welcome' dialog with disabled Continue Button …"
welcomeResults=$( eval "${dialogBinary} --jsonfile ${welcomeJSONFile} --json --button1disabled" )
Expand Down