fix(install): fixes error that leads to unusable moonraker.conf
This should fix #14 Signed-off-by: Stephan Wendel <me@stephanwe.de>
This commit is contained in:
parent
ee6598c292
commit
fab3772e10
@ -154,8 +154,9 @@ function remove_existing_webcamd {
|
|||||||
echo -e "webcam.txt kept,but no longer necessary ..."
|
echo -e "webcam.txt kept,but no longer necessary ..."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function install_crowsnest {
|
function install_crowsnest {
|
||||||
local bin_path logrotatefile moonraker_conf moonraker_update
|
local addconf bin_path logrotatefile moonraker_conf moonraker_update
|
||||||
local webcamd_bin servicefile template
|
local webcamd_bin servicefile template
|
||||||
bin_path="/usr/local/bin"
|
bin_path="/usr/local/bin"
|
||||||
webcamd_bin="${HOME}/crowsnest/webcamd"
|
webcamd_bin="${HOME}/crowsnest/webcamd"
|
||||||
@ -164,6 +165,13 @@ function install_crowsnest {
|
|||||||
logrotatefile="${HOME}/crowsnest/file_templates/logrotate_webcamd"
|
logrotatefile="${HOME}/crowsnest/file_templates/logrotate_webcamd"
|
||||||
moonraker_conf="${HOME}/klipper_config/moonraker.conf"
|
moonraker_conf="${HOME}/klipper_config/moonraker.conf"
|
||||||
moonraker_update="${PWD}/file_templates/moonraker_update.txt"
|
moonraker_update="${PWD}/file_templates/moonraker_update.txt"
|
||||||
|
## helper func moonraker update_manager
|
||||||
|
function add_update_entry {
|
||||||
|
sudo -u "${BASE_USER}" \
|
||||||
|
cp "${moonraker_conf}" "${moonraker_conf}.backup" &&
|
||||||
|
cat "${moonraker_conf}" "${moonraker_update}" > /tmp/moonraker.conf &&
|
||||||
|
cp -rf /tmp/moonraker.conf "${moonraker_conf}"
|
||||||
|
}
|
||||||
echo -e "\nInstall webcamd Service ..."
|
echo -e "\nInstall webcamd Service ..."
|
||||||
## Install Dependencies
|
## Install Dependencies
|
||||||
echo -e "Installing 'crowsnest' Dependencies ..."
|
echo -e "Installing 'crowsnest' Dependencies ..."
|
||||||
@ -199,21 +207,40 @@ function install_crowsnest {
|
|||||||
sudo sed -i 's|pi|'"${BASE_USER}"'|g' /etc/logrotate.d/webcamd
|
sudo sed -i 's|pi|'"${BASE_USER}"'|g' /etc/logrotate.d/webcamd
|
||||||
fi
|
fi
|
||||||
echo -e "Linking logrotate file ... [OK]\r"
|
echo -e "Linking logrotate file ... [OK]\r"
|
||||||
|
## update systemd if not unattended
|
||||||
if [ "${UNATTENDED}" == "false" ] && [ "$(stat -c %i /)" == "2" ]; then
|
if [ "${UNATTENDED}" == "false" ] && [ "$(stat -c %i /)" == "2" ]; then
|
||||||
echo -en "Reload systemd to enable new deamon ...\r"
|
echo -en "Reload systemd to enable new deamon ...\r"
|
||||||
sudo systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
echo -e "Reload systemd to enable new daemon ... [OK]"
|
echo -e "Reload systemd to enable new daemon ... [OK]"
|
||||||
fi
|
fi
|
||||||
|
## enable webcamd.service
|
||||||
echo -en "Enable webcamd.service on boot ...\r"
|
echo -en "Enable webcamd.service on boot ...\r"
|
||||||
sudo systemctl enable webcamd.service
|
sudo systemctl enable webcamd.service
|
||||||
echo -e "Enable webcamd.service on boot ... [OK]\r"
|
echo -e "Enable webcamd.service on boot ... [OK]\r"
|
||||||
if [ "${CROWSNEST_ADD_CROWSNEST_MOONRAKER}" == "1" ] &&
|
## Add moonraker update manager entry
|
||||||
|
## Unattended
|
||||||
|
if [ "${UNATTENDED}" == "true" ] &&
|
||||||
|
[ "${CROWSNEST_ADD_CROWSNEST_MOONRAKER}" == "1" ] &&
|
||||||
[ -f "${moonraker_conf}" ]; then
|
[ -f "${moonraker_conf}" ]; then
|
||||||
echo -en "Adding Crowsnest Update Manager entry to moonraker.conf ...\r"
|
echo -en "Adding Crowsnest Update Manager entry to moonraker.conf ...\r"
|
||||||
cat "${moonraker_conf}" "${moonraker_update}" | \
|
add_update_entry
|
||||||
tee "${moonraker_conf}" > /dev/null
|
|
||||||
echo -e "Adding Crowsnest Update Manager entry to moonraker.conf ... [OK]"
|
echo -e "Adding Crowsnest Update Manager entry to moonraker.conf ... [OK]"
|
||||||
fi
|
fi
|
||||||
|
## Manual install
|
||||||
|
if [ "${UNATTENDED}" != "true" ]; then
|
||||||
|
read -rp "Do you want to add [update_manager] entry?(y/n) " addconf
|
||||||
|
case "${addconf}" in
|
||||||
|
y*|Y*)
|
||||||
|
add_update_entry
|
||||||
|
;;
|
||||||
|
|
||||||
|
n*|N*)
|
||||||
|
echo -e "Adding Crowsnest Update Manager entry to moonraker.conf ... [SKIPPED]"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
## add $USER to group video
|
||||||
echo -en "Add User ${BASE_USER} to group 'video' ...\r"
|
echo -en "Add User ${BASE_USER} to group 'video' ...\r"
|
||||||
if [ "$(groups | grep -c video)" == "0" ]; then
|
if [ "$(groups | grep -c video)" == "0" ]; then
|
||||||
sudo usermod -aG video "${BASE_USER}" > /dev/null
|
sudo usermod -aG video "${BASE_USER}" > /dev/null
|
||||||
|
@ -74,7 +74,6 @@ function ask_uninstall {
|
|||||||
if [ -x "/usr/local/bin/webcamd" ] && [ -d "${HOME}/crowsnest" ]; then
|
if [ -x "/usr/local/bin/webcamd" ] && [ -d "${HOME}/crowsnest" ]; then
|
||||||
read -rp "Do you REALLY want to remove existing 'crowsnest'? (YES/NO) " remove
|
read -rp "Do you REALLY want to remove existing 'crowsnest'? (YES/NO) " remove
|
||||||
if [ "${remove}" = "YES" ]; then
|
if [ "${remove}" = "YES" ]; then
|
||||||
sudo echo -e "\nPlease enter your password!"
|
|
||||||
uninstall_crowsnest
|
uninstall_crowsnest
|
||||||
uninstall_v4l2rtsp
|
uninstall_v4l2rtsp
|
||||||
# go unsinstaller is deprecated will be removed in future
|
# go unsinstaller is deprecated will be removed in future
|
||||||
|
Loading…
x
Reference in New Issue
Block a user