CreatBot/CreatBotCrowsnest
CreatBot/CreatBotCrowsnest
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Automated] Merged develop into target master

Browse Source
This commit is contained in:
Stefan Dej 2023-11-23 23:24:49 +01:00 committed by GitHub
commit 80603788bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 76 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,7 +1,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3
@ -39,6 +41,9 @@ help: ## Shows this help
update: ## Update crowsnest (fetches and pulls repository changes)
@git fetch && git pull
@bash -c 'bin/build.sh --reclone'
${MAKE} buildclean
${MAKE} build
report: ## Generate report.txt
@if [ -f ~/report.txt ]; then rm -f ~/report.txt; fi

33
README.md
View File

@ -62,28 +62,35 @@ Tested and/or did not work: :x: \
Should work but not tested: :question: \
Not available: :heavy_minus_sign:
| Operating System | X86 Architecture | ARM Architecture |
| :-------------------------------: | :----------------: | :----------------------: |
| Raspberry Pi OS (buster) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| Raspberry Pi OS (bullseye) | :heavy_minus_sign: | :heavy_check_mark: |
| MainsailOS (<0.7.1) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| MainsailOS (>1.0.0) | :heavy_minus_sign: | :heavy_check_mark: (rpi) |
| Armbian | :question: | :heavy_check_mark: |
| Ubuntu Server 20.04 | :heavy_check_mark: | :question: |
| Ubuntu Server 22.04 LTS | :heavy_check_mark: | :heavy_check_mark: (rpi) |
| Linux Mint 21 (codename: vanessa) | :heavy_check_mark: | :question: |
| Archlinux (and derivatives) | :x: | :x: |
| Alpine Linux | :x: | :x: |
| Operating System | X86 Architecture | ARM Architecture |
| :-------------------------------: | :----------------: | :-----------------------------------------: |
| Raspberry Pi OS (buster) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| Raspberry Pi OS (bullseye) | :heavy_minus_sign: | :heavy_check_mark: |
| Raspberry Pi OS (bookworm) | :heavy_minus_sign: | :heavy_check_mark: ([Hint](#hint-bookworm)) |
| MainsailOS (<0.7.1) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| MainsailOS (>1.0.0) | :heavy_minus_sign: | :heavy_check_mark: (rpi) |
| Armbian | :question: | :heavy_check_mark: |
| DietPi | :question: | :heavy_check_mark: (rpi) |
| Ubuntu Server 20.04 | :heavy_check_mark: | :question: |
| Ubuntu Server 22.04 LTS | :heavy_check_mark: | :heavy_check_mark: (rpi) |
| Ubuntu Server 23.10 | :question: | :heavy_check_mark: (rpi) |
| Linux Mint 21 (codename: vanessa) | :heavy_check_mark: | :question: |
| Archlinux (and derivatives) | :x: | :x: |
| Alpine Linux | :x: | :x: |
_If you test that on other distributions, feel free to open a Pull Request to enhance documentation._
#### Hint
#### Hint Buster
OS images that are based on Debian 10 (codename 'buster') are no longer supported with Crowsnest version 4 (current `master` branch)!
Please use the `legacy/v3` branch for these OS types.\
See the [README.md](https://github.com/mainsail-crew/crowsnest/tree/legacy/v3) of this branch for usage instructions.
#### Hint Bookworm
Raspberry Pi OS images that are based on Debian 12 (codename 'bookworm') currently use a different branch of [camera-streamer](https://github.com/ayufan/camera-streamer)!
---
## Contribute

5
tools/install.sh
View File

@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3
@ -65,6 +67,7 @@ main() {
if [[ "${CROWSNEST_UNATTENDED}" != "1" ]]; then
msg "Doing some tests ...\n"
detect_existing_webcamd
if shallow_cs_dependencies_check; then
CN_INSTALL_CS="1"
else

4
tools/libs/build_apps.sh
View File

@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3

39
tools/libs/core.sh
View File

@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3
@ -222,7 +224,7 @@ install_env_file() {
sudo -u "${BASE_USER}" cp -f "${env_file}" "${env_target}"
sed -i "s|%CONFPATH%|${CROWSNEST_CONFIG_PATH}|" "${env_target}"
[[ -f "${env_target}" ]] &&
grep -q "${BASE_USER}" "${env_target}" || return 1
grep -q "${CROWSNEST_CONFIG_PATH}" "${env_target}" || return 1
}
install_logrotate_conf() {
@ -282,3 +284,36 @@ dietpi_cs_settings() {
fi
fi
}
### Detect legacy webcamd.
detect_existing_webcamd() {
local disable
msg "Checking for mjpg-streamer ...\n"
if [[ -x "/usr/local/bin/webcamd" ]] && [[ -d "/home/${BASE_USER}/mjpg-streamer" ]]; then
msg "Found an existing mjpg-streamer installation!"
msg "This should be stopped and disabled!"
while true; do
read -erp "Do you want to stop and disable existing 'webcamd'? (Y/n) " -i "Y" disable
case "${disable}" in
y|Y|yes|Yes|YES)
msg "Stopping webcamd.service ..."
sudo systemctl stop webcamd.service &> /dev/null
status_msg "Stopping webcamd.service ..." "0"
msg "\nDisabling webcamd.service ...\r"
sudo systemctl disable webcamd.service &> /dev/null
status_msg "Disabling webcamd.service ..." "0"
return
;;
n|N|no|No|NO)
msg "\nYou should disable and stop webcamd to use crowsnest without problems!\n"
return
;;
*)
msg "You answered '${disable}'! Invalid input ..." ;;
esac
done
fi
status_msg "Checking for mjpg-streamer ..." "0"
}

4
tools/libs/messages.sh
View File

@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3

4
tools/libs/pkglist-rpi.sh
View File

@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2023
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2023 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3