@@ -3499,7 +3499,7 @@ check_if_buster()
34993499display_image ()
35003500{
35013501 local IMAGE_OR_CUSTOM=" ${1} "
3502- local FULL_FILENAME FILENAME EXTENSION IMAGE_NAME COLOR CUSTOM_MESSAGE MSG X I
3502+ local FULL_FILENAME FILENAME EXTENSION COLOR CUSTOM_MESSAGE MSG X I
35033503
35043504 if [[ -s ${SETTINGS_FILE} ]]; then # The file may not exist yet.
35053505 FULL_FILENAME=" $( settings " .filename" ) "
@@ -3532,9 +3532,7 @@ display_image()
35323532 display_msg --logonly info " ${MSG} "
35333533 fi
35343534 else
3535- IMAGE_NAME=" ${IMAGE_OR_CUSTOM} "
3536-
3537- if [[ ${IMAGE_NAME} == " ConfigurationNeeded" && -f ${ALLSKY_POST_INSTALL_ACTIONS} ]]; then
3535+ if [[ -f ${ALLSKY_POST_INSTALL_ACTIONS} ]]; then
35383536 # Add a message the user will see in the WebUI.
35393537 MSG=" Actions needed. See ${ALLSKY_POST_INSTALL_ACTIONS} ."
35403538 X=" ${ALLSKY_POST_INSTALL_ACTIONS/ ${ALLSKY_HOME} / } "
@@ -3544,7 +3542,7 @@ display_image()
35443542 touch " ${ALLSKY_POST_INSTALL_ACTIONS} _initial_message"
35453543 fi
35463544
3547- X=" ${IMAGE_NAME } .${EXTENSION} "
3545+ X=" ${IMAGE_OR_CUSTOM } .${EXTENSION} "
35483546 display_msg --logonly info " Displaying notification image '${X} '"
35493547 cp " ${ALLSKY_NOTIFICATION_IMAGES} /${X} " " ${I} " ||
35503548 display_msg --log info " WARNING: unable to copy '${X} ' to '${I} '"
@@ -3608,12 +3606,12 @@ check_restored_settings()
36083606 [[ -f ${s} ]] && sort_settings_file " ${s} "
36093607 done
36103608
3611- if [[ ${RESTORED_PRIOR_SETTINGS_FILE} == " true" && \
3612- ${COPIED_PRIOR_CONFIG_SH} == " true" && \
3609+ if [[ ${RESTORED_PRIOR_SETTINGS_FILE} == " true" &&
3610+ ${COPIED_PRIOR_CONFIG_SH} == " true" &&
36133611 ${COPIED_PRIOR_FTP_SH} == " true" ]]; then
36143612 # We restored all the prior settings so no configuration is needed.
36153613 # However, check if a reboot is needed.
3616- CONFIGURATION_NEEDED=" false "
3614+ CONFIGURATION_NEEDED=" review "
36173615 if [[ ${REBOOT_NEEDED} == " true" ]]; then
36183616 IMG=" RebootNeeded"
36193617 else
@@ -3890,16 +3888,23 @@ do_done()
38903888 do_allsky_status " ${ALLSKY_STATUS_NOT_RUNNING} "
38913889 display_image --custom " lime" " Allsky is\nready to start"
38923890 display_msg --log progress " \nInstallation is done." " You must manually restart Allsky."
3893- elif [[ ${CONFIGURATION_NEEDED} != " true" ]]; then
3894- # A status string.
3895- exit_installation 0 " ${CONFIGURATION_NEEDED} " " "
3896- else
3891+ elif [[ ${CONFIGURATION_NEEDED} == " true" ]]; then
38973892 # "true"
38983893 display_image " ConfigurationNeeded"
38993894 do_allsky_status " ${ALLSKY_STATUS_NEEDS_CONFIGURATION} "
39003895 MSG=" but Allsky needs to be configured before it will start."
39013896 display_msg --log progress " \nInstallation is done" " ${MSG} "
39023897 display_msg progress " " " Go to the 'Allsky Settings' page of the WebUI to configure Allsky."
3898+ elif [[ ${CONFIGURATION_NEEDED} == " review" ]]; then
3899+ display_image " ReviewNeeded"
3900+ do_allsky_status " ${ALLSKY_STATUS_NEEDS_REVIEW} "
3901+ MSG=" Please review the settings on the WebUI's 'Allsky Settings' page and make any necessary changes."
3902+ display_msg --log progress " \nInstallation is done." " ${MSG} "
3903+ display_msg progress " " " Go to the 'Allsky Settings' page of the WebUI to configure Allsky."
3904+
3905+ else
3906+ # A different status string.
3907+ exit_installation 0 " ${CONFIGURATION_NEEDED} " " "
39033908 fi
39043909
39053910 display_msg progress " \nEnjoy Allsky!\n"
0 commit comments