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

Jump to bottom

Additional install.sh restart changes #2771

Merged
merged 12 commits into from
Jun 12, 2023
Merged

Additional install.sh restart changes #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
067b47a
Update install.sh
EricClaeys Jun 11, 2023
c9381e8
Update install.sh: rename LOCALE to DESIRED_LOCALE
EricClaeys Jun 11, 2023
9b44834
Update install.sh: minor wording changes.
EricClaeys Jun 12, 2023
cedf827
Update install.sh: use "git rev-parse --abbrev-ref HEAD" to determine…
EricClaeys Jun 12, 2023
e4531a3
Update install.sh: add extra "MORE_STATUS" argument to exit_installation
EricClaeys Jun 12, 2023
bf586b4
Update install.sh: Add more status lines.
EricClaeys Jun 12, 2023
971f3a4
Update install.sh: skip already performed Python dependency installat…
EricClaeys Jun 12, 2023
dee6c03
Update install.sh: hopefully last set of changes for restarting insta…
EricClaeys Jun 12, 2023
9807c67
Update functions.php: check for "" lastChanged
EricClaeys Jun 12, 2023
d92c1a1
Update allsky.sh: check for unconfigured settings
EricClaeys Jun 12, 2023
45a2470
Update install.sh: Reset lastChanged to force users to look at config…
EricClaeys Jun 12, 2023
accdeb3
Update install.sh: convert a few more old settings to new
EricClaeys Jun 12, 2023
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
6 changes: 6 additions & 0 deletions allsky.sh
View file
Open in desktop
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
View file
Open in desktop
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