Skip to content

Commit d8f8017

Browse files
authored
Update install.sh: Don't reboot if upgrading from v2024.12.06
1 parent 7affc13 commit d8f8017

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

install.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ cd "${ALLSKY_HOME}" || exit "${EXIT_ERROR_STOP}"
2222
# The ALLSKY_POST_INSTALL_ACTIONS contains information the user needs to act upon after installation.
2323
rm -f "${ALLSKY_POST_INSTALL_ACTIONS}" # Shouldn't be there, but just in case.
2424
rm -f "${ALLSKY_MESSAGES}" # Start out with no messages.
25-
26-
# In case it's left over from a prior install.
27-
rm -f "${ALLSKY_REBOOT_NEEDED}"
25+
rm -f "${ALLSKY_REBOOT_NEEDED}" # In case it's left over from a prior install.
2826

2927
SHORT_TITLE="Allsky Installer"
3028
TITLE="${SHORT_TITLE} - ${ALLSKY_VERSION}"
@@ -76,6 +74,8 @@ declare -r FIRST_CAMERA_TYPE_BASE_VERSION="v2023.05.01"
7674
declare -r FIRST_VERSION_VERSION="v2022.03.01"
7775
# Versions before ${FIRST_VERSION_VERSION} didn't have version numbers.
7876
declare -r PRE_FIRST_VERSION_VERSION="old"
77+
# A reboot isn't needed if upgrading from this base release. This changes every release.
78+
declare -r NO_REBOOT_BASE_VERSION="v2024.12.06"
7979

8080
##### Information on the prior Allsky version, if used
8181
USE_PRIOR_ALLSKY="false"
@@ -1314,6 +1314,14 @@ get_desired_locale()
13141314
# Get current locale to use as the default.
13151315
# Ignore any line that doesn't have a value, and get rid of double quotes.
13161316
TEMP_LOCALE="$( locale | grep -E "^LANG=|^LANGUAGE=|^LC_ALL=" | sed -e '/=$/d' -e 's/"//g' )"
1317+
1318+
CURRENT_LOCALE="$(
1319+
eval "$( locale | grep -E "^LANG=|^LANGUAGE=|^LC_ALL=" | sed -e '/=$/d' -e 's/"//g' )"
1320+
[[ -n ${LANG} ]] && echo "${LANG}" && return
1321+
[[ -n ${LANGUAGE} ]] && echo "${LANGUAGE}" && return
1322+
echo "${LC_ALL}"
1323+
)"
1324+
if false; then # XXXXXXXXXXXXX
13171325
CURRENT_LOCALE="$( echo "${TEMP_LOCALE}" | sed --silent -e '/LANG=/ s/LANG=//p' )"
13181326
if [[ -z ${CURRENT_LOCALE} ]]; then
13191327
CURRENT_LOCALE="$( echo "${TEMP_LOCALE}" | sed --silent -e '/LANGUAGE=/ s/LANGUAGE=//p' )"
@@ -1470,7 +1478,8 @@ is_reboot_needed()
14701478
local NEW_VERSION="${2}"
14711479
local NEW_BASE_VERSION="$( remove_point_release "${NEW_VERSION}" )"
14721480

1473-
if [[ ${NEW_BASE_VERSION} == "${OLD_BASE_VERSION}" ]]; then
1481+
if [[ ${NEW_BASE_VERSION} == "${OLD_BASE_VERSION}" ||
1482+
${OLD_BASE_VERSION} == "${NO_REBOOT_BASE_VERSION}" ]]; then
14741483
# Assume just bug fixes between point releases.
14751484
# TODO: this may not always be true.
14761485
REBOOT_NEEDED="false"

0 commit comments

Comments
 (0)