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

install.sh: couple bug fixes #2532

Merged
merged 1 commit into from
Apr 4, 2023
Merged

install.sh: couple bug fixes #2532

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
12 changes: 5 additions & 7 deletions website/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,6 @@ check_if_remote_website_ready()
display_msg info "${MSG}"
display_msg --logonly info "User stopped remote installation - not ready."
exit_installation 1
else
exit_installation 0
fi
}

Expand Down Expand Up @@ -696,7 +694,7 @@ do_remote_website() {
echo -e "${X}"
fi

upload_data_json_file "remote"
upload_data_json_file "remote" || exit_installation 2

if [[ -f ${ALLSKY_REMOTE_WEBSITE_CONFIGURATION_FILE} ]]; then
# The user is upgrading a new-style remote Website.
Expand Down Expand Up @@ -993,13 +991,13 @@ fi

NEW_WEBSITE_VERSION="" # version we're upgrading to

##### See if there's a prior Website and if so, set some variables.
does_prior_Allsky_Website_exist
##### See if there's a prior local Website and if so, set some variables.
[[ ${DO_REMOTE_WEBSITE} == "false" ]] && does_prior_Allsky_Website_exist

##### Get the current and new Website versions taking branch into account.
get_versions_and_branches

##### Make sure the remote site is ready for us. If not ready the function exists
##### Make sure the remote site is ready for us. If not ready the function exits.
[[ ${DO_REMOTE_WEBSITE} == "true" ]] && check_if_remote_website_ready

##### Display the welcome header.
Expand Down Expand Up @@ -1034,7 +1032,7 @@ download_Allsky_Website

modify_locations
modify_configuration_variables
upload_data_json_file "local" || exit 1
upload_data_json_file "local" || exit_installation 1
restore_prior_files

# Create any directories not created above.
Expand Down