Skip to content

Commit

Permalink
Merge pull request #2771 from thomasjacquin/Additional-install.sh-res…
Browse files Browse the repository at this point in the history
…tart-changes

Additional install.sh restart changes
  • Loading branch information
EricClaeys authored Jun 12, 2023
2 parents 6381f02 + accdeb3 commit 5ca97a1
Show file tree
Hide file tree
Showing 3 changed files with 266 additions and 160 deletions.
6 changes: 6 additions & 0 deletions allsky.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ source "${ALLSKY_CONFIG}/config.sh" || exit ${ALLSKY_ERROR_STOP}
#shellcheck disable=SC2086 source-path=scripts
source "${ALLSKY_SCRIPTS}/installUpgradeFunctions.sh" || exit ${ALLSKY_ERROR_STOP}

# Make sure the settings have been configured after an installation or upgrade.
LAST_CHANGED=$(settings ".lastChanged")
if [[ ${LAST_CHANGED} == "" || ${LAST_CHANGED} == "null" ]]; then
echo "*** ===== Allsky needs to be configured before it can be used. See the WebUI."
doExit "${EXIT_ERROR_STOP}" "Error" "ConfigurationNeeded"
fi

SEE_LOG_MSG="See ${ALLSKY_LOG}"
ARGS_FILE="${ALLSKY_TMP}/capture_args.txt"
Expand Down
2 changes: 1 addition & 1 deletion html/includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function check_if_configured($page, $calledFrom) {
if ($calledFrom === "main" && $page === "configuration")
return;

if ($lastChanged === null) {
if ($lastChanged === null || $lastChanged === "") {
// The settings aren't configured - probably right after an installation.
if ($page === "configuration")
$m = "";
Expand Down
Loading

0 comments on commit 5ca97a1

Please sign in to comment.