Skip to content

Commit 269c653

Browse files
authored
Update install.sh: fix: use adduser instead of addgroup
* Also remove request for feedback - no one provided any. * Restart daemon before mounting allsky/tmp
1 parent 6922fd4 commit 269c653

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

install.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ check_and_mount_tmp()
711711
fi
712712

713713
# Now mount and restore any images that were there before
714+
sudo systemctl daemon-reload 2> /dev/null
714715
sudo mount -a
715716
if [[ -d ${TMP_DIR} ]]; then
716717
mv "${TMP_DIR}"/* "${ALLSKY_TMP}"
@@ -932,14 +933,14 @@ set_permissions()
932933
### TODO: Hmmm. We need to run "sudo" to add to the group,
933934
### but we don't have "sudo" permissions yet... so this will likely fail:
934935

935-
sudo addgroup --quiet "${ALLSKY_OWNER}" "sudo"
936+
sudo adduser --quiet "${ALLSKY_OWNER}" "sudo"
936937
fi
937938
# shellcheck disable=SC2076
938939
if ! [[ ${G} =~ "(${WEBSERVER_GROUP})" ]]; then
939940
display_msg --log progress "Adding ${ALLSKY_OWNER} to ${WEBSERVER_GROUP} group."
940-
sudo addgroup --quiet "${ALLSKY_OWNER}" "${WEBSERVER_GROUP}"
941+
sudo adduser --quiet "${ALLSKY_OWNER}" "${WEBSERVER_GROUP}"
941942

942-
# TODO: We had a case where the login shell wasn't in the group after "addgroup"
943+
# TODO: We had a case where the login shell wasn't in the group after "adduser"
943944
# until the user logged out and back in.
944945
# And this was AFTER he ran install.sh and rebooted.
945946
# Not sure what to do about this...
@@ -2856,11 +2857,6 @@ check_new_exposure_algorithm()
28562857
if whiptail --title "${TITLE}" --yesno "${MSG}" 15 "${WT_WIDTH}" 3>&1 1>&2 2>&3; then
28572858
display_msg --logonly info "Enabling ${FIELD}."
28582859
update_json_file ".${FIELD}" "true" "${SETTINGS_FILE}"
2859-
2860-
MSG="Please provide feedback on the new auto-exposure algorithm"
2861-
MSG="${MSG} by entering a Discussion item in GitHub."
2862-
MSG="${MSG}\nYou can disable it by changing 'New Exposure Algorithm' in the WebUI."
2863-
display_msg notice "${MSG}"
28642860
else
28652861
display_msg --logonly info "User elected NOT to use ${FIELD}."
28662862
fi

0 commit comments

Comments
 (0)