Skip to content

Commit 0c0df27

Browse files
committed
feat!: update crowsnest to 2.0.0
Features: This is an Major update and rebuilds the whole behavior of webcamd. Includes a new install/uninstall/update chain based on make command BREAKING CHANGE: crowsnest has to be reinstalled! In detail: Replaced v4l2rtspserver with rtsp-simple-server Updates ustreamer to version 4.13 uses make as install helper instead of scripts. Updated documentation accordingly This is a squashed commit of the following: commit 44dcb8e Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 14:54:43 2022 +0100 chore: removed deprecated .gorc template Signed-off-by: Stephan Wendel <[email protected]> commit 334bf7d Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 14:40:58 2022 +0100 refactor: refactored tools/update.sh Improved comparing of installed and available files. Includes various improvements and fixes. Signed-off-by: Stephan Wendel <[email protected]> commit 89f220e Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 13:21:22 2022 +0100 chore(rtsp): updated rtsp-simple-server to version v0.17.17 See https://github.com/aler9/rtsp-simple-server/releases/tag/v0.17.17 Signed-off-by: Stephan Wendel <[email protected]> commit 23ec92a Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 13:00:16 2022 +0100 fix(build): updates submodules before build If moonraker pulls update it does not update the Submodules, therefore the updated submodules will be pull on build. Signed-off-by: Stephan Wendel <[email protected]> commit a5b88bd Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 12:38:11 2022 +0100 chore: updated ustreamer to version 4.13 Used commit: pikvm/ustreamer@61ab2a8 Signed-off-by: Stephan Wendel <[email protected]> commit 574667a Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 12:28:34 2022 +0100 fix(uninstall): fixed error in func remove_raspicam_fix Determine if Raspberry Device didnt work as expected. Also added 'skip' message Signed-off-by: Stephan Wendel <[email protected]> commit ce9bc4d Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 12:20:34 2022 +0100 fix(x86 install): replaced libjpeg62-turbo-dev with libjpeg-dev Signed-off-by: Stephan Wendel <[email protected]> commit 393b3ed Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 10:36:50 2022 +0100 fix(install): fixed error in func install_raspicam_fix Raspberry Device was not recognized by Installer Signed-off-by: Stephan Wendel <[email protected]> commit d4dc9fa Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 10:07:56 2022 +0100 fix: removed webrtc from webcamd lib was sourced but not available, leads to shellcheck error and webcamd fails to start Signed-off-by: Stephan Wendel <[email protected]> commit f18aa40 Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 09:58:46 2022 +0100 chore: removed webrtc from Makefile Signed-off-by: Stephan Wendel <[email protected]> commit 39cb626 Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 09:53:54 2022 +0100 chore: removed webrtc Removed webrtc handling and documentation. Signed-off-by: Stephan Wendel <[email protected]> commit 55baca6 Merge: da1481f a92d1db Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 09:02:49 2022 +0100 Merge branch 'feat/multiarch' into master-nightly commit da1481f Merge: eb4efe7 0041ecf Author: Stephan Wendel <[email protected]> Date: Sun Feb 27 08:58:53 2022 +0100 Merge branch 'nigthly-webrtc' into master-nightly commit eb4efe7 Author: Stephan Wendel <[email protected]> Date: Wed Dec 29 08:25:48 2021 +0100 style(watchdog.sh): Reformatted func get_conf_devices Signed-off-by: Stephan Wendel <[email protected]> commit 3bd3a93 Author: Stephan Wendel <[email protected]> Date: Sun Dec 19 13:21:15 2021 +0100 REFACTOR: Bumped CODE_OF_CONDUCT to V2.1 * See https://www.contributor-covenant.org/version/2/1/code_of_conduct/ Signed-off-by: Stephan Wendel <[email protected]> commit 80a560f Author: Stephan Wendel <[email protected]> Date: Sun Dec 19 13:18:29 2021 +0100 IMPROVE: Run shellcheck workflow only if shellscript pushed. Signed-off-by: Stephan Wendel <[email protected]> commit a92d1db Author: Stephan Wendel <[email protected]> Date: Mon Feb 14 20:00:50 2022 +0100 feat: added x86_64 support This is tested in a Debian Bullseye VM Needs Bare Metal testing before merge. Signed-off-by: Stephan Wendel <[email protected]> commit 0041ecf Author: Stephan Wendel <[email protected]> Date: Mon Jan 31 22:47:07 2022 +0100 fix: added filter to webrtc start_param Added filter to start_param of webrtc-streamer. This should fix spamming of devices that are not marked for webrtc. Also removed webserver limiting flag. Signed-off-by: Stephan Wendel <[email protected]> commit 725d762 Author: Stephan Wendel <[email protected]> Date: Mon Jan 31 22:05:51 2022 +0100 refactor: implemented webrtc-streamer Implemented new webrtc server See https://github.com/mpromonet/webrtc-streamer Signed-off-by: Stephan Wendel <[email protected]> commit 658e3e3 Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 20:08:10 2022 +0100 refactor: implemented webrtc-streamer Replaced RTSPtoWebRTC with webrtc-streamer This makes also installation of go lang obsolete. Signed-off-by: Stephan Wendel <[email protected]> commit 04c088d Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 16:25:17 2022 +0100 refactor: updated bin/Makefile to install webrtc-streamer Signed-off-by: Stephan Wendel <[email protected]> commit 8f4943c Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 15:43:00 2022 +0100 chore: prepared use of webrtc-streamer Signed-off-by: Stephan Wendel <[email protected]> commit 7566b42 Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 15:37:48 2022 +0100 refactor: modified uninstall.sh and update.sh According to remove of RTSPtoWebRTC changed uninstall and update scripts Signed-off-by: Stephan Wendel <[email protected]> commit 1918dbd Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 14:48:13 2022 +0100 refactor: removed go from install and update mechanism Use of go environment is obsolete. Signed-off-by: Stephan Wendel <[email protected]> commit ab32cc2 Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 14:29:08 2022 +0100 refactor!: removed go install routine Use of local installed go environment no longer needed. Signed-off-by: Stephan Wendel <[email protected]> commit e9bcb06 Author: Stephan Wendel <[email protected]> Date: Sun Jan 30 14:25:00 2022 +0100 refactor!: removed RTSPtoWebRTC submodule BREAKING CHANGE: This commit drops RTSPtoWebRTC Signed-off-by: Stephan Wendel <[email protected]> commit 6d0558c Author: Stephan Wendel <[email protected]> Date: Wed Jan 12 19:30:47 2022 +0100 style: use newline instead of carriage return in func sub_init This should look better on commandline than previous Signed-off-by: Stephan Wendel <[email protected]> commit d5187b5 Author: Stephan Wendel <[email protected]> Date: Wed Jan 12 19:21:56 2022 +0100 fix(install): empty function in L#269 removed Fixes Error due empty inserted function. Signed-off-by: Stephan Wendel <[email protected]> commit 1df952d Author: Stephan Wendel <[email protected]> Date: Wed Jan 12 19:08:45 2022 +0100 fix(webrtc.sh): fixes error sc2004 in L#52 In ./libs/webrtc.sh line 52: c=$((${c}+1)) ^--^ SC2004 (style): $/${} is unnecessary on arithmetic variables. Signed-off-by: Stephan Wendel <[email protected]> commit 7a89eb9 Author: Stephan Wendel <[email protected]> Date: Wed Jan 12 18:58:58 2022 +0100 fix: fixes errors during make install or make update Issues with missing cloned submodules and incorrect exports of GOPATH fixed. Signed-off-by: Stephan Wendel <[email protected]> commit aaa0db5 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 22:26:33 2022 +0100 fix(Makefile): initialize submodules on update Fixes Error submodules didnt get initialized on update. Signed-off-by: Stephan Wendel <[email protected]> commit 0d1baa1 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 22:13:13 2022 +0100 fix: bug in bin/Makefile leads to lose version file Signed-off-by: Stephan Wendel <[email protected]> commit be87a78 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 21:58:29 2022 +0100 docs: updated Readme.md Activate submodules if it gets cloned. Signed-off-by: Stephan Wendel <[email protected]> commit 54d9f83 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 21:12:46 2022 +0100 fix(update): added check if file bcm2835-v4l2.conf exist If file not exist, copy it. Signed-off-by: Stephan Wendel <[email protected]> commit c5be301 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 20:50:06 2022 +0100 build: removed zip release Signed-off-by: Stephan Wendel <[email protected]> commit 381b879 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 20:44:41 2022 +0100 docs: updated README.md according to latest changes Signed-off-by: Stephan Wendel <[email protected]> commit 43f4e10 Author: Stephan Wendel <[email protected]> Date: Mon Jan 10 20:16:16 2022 +0100 feat(webrtc): added webrtc server Cameras with h264 can easily streamed by webrtc technics. Added new Mode 'webrtc' Signed-off-by: Stephan Wendel <[email protected]> commit 87b5d77 Author: Stephan Wendel <[email protected]> Date: Sun Jan 9 15:12:28 2022 +0100 feature(ustreamer): added func to detect mjpg hardware encoder Now ustreamer uses if possible camera inbuilt Hardware mjpg encoder Signed-off-by: Stephan Wendel <[email protected]> commit 0c8fc94 Author: Stephan Wendel <[email protected]> Date: Sun Jan 9 13:11:59 2022 +0100 refactor(ustreamer.sh): refactored construct of start_param To shorten the code a bit renamed some variables and using an array to form start_param. Also dropped start failure if device not found, cause ustreamer displays a "NO SIGNAL" Image if there is no device. Signed-off-by: Stephan Wendel <[email protected]> commit f4e1a57 Author: Stephan Wendel <[email protected]> Date: Sun Jan 9 12:33:39 2022 +0100 refactor(logging.sh): renamed variable in func delete_log Renamed Variable 'devel' to 'del_log' to be more obvious Signed-off-by: Stephan Wendel <[email protected]> commit 1e078bb Author: Stephan Wendel <[email protected]> Date: Sat Jan 8 13:37:39 2022 +0100 chore(editorconfig): added HTML related stuff to .editorconfig Signed-off-by: Stephan Wendel <[email protected]> commit 67bd0f4 Author: Stephan Wendel <[email protected]> Date: Fri Jan 7 21:19:39 2022 +0100 fix: fixes error in h264 detection of selected devices Signed-off-by: Stephan Wendel <[email protected]> commit 90635a4 Author: Stephan Wendel <[email protected]> Date: Wed Jan 5 17:34:02 2022 +0100 feat(rtsp): added check for h264 cams Renamed function prepare_rtsp to run_ffmpeg. Refactored construct of start_param for ffmpeg. This is now able to check for h264 cam. If Cam isnt able to deliver h264 it uses OpenMAX IL to encode. Refactored init_stream.sh accordingly. Signed-off-by: Stephan Wendel <[email protected]> commit 210c6d4 Author: Stephan Wendel <[email protected]> Date: Wed Jan 5 16:42:19 2022 +0100 refactor(check_omx): using echo instead of return Signed-off-by: Stephan Wendel <[email protected]> commit 9ff6530 Author: Stephan Wendel <[email protected]> Date: Wed Jan 5 13:25:29 2022 +0100 fix(check_omx): check_omx now uses full path to bin Function throws Error if not the full path is given. Uses BASE_CN_PATH var to determine full path. Signed-off-by: Stephan Wendel <[email protected]> commit 2860e32 Author: Stephan Wendel <[email protected]> Date: Wed Jan 5 12:59:08 2022 +0100 style(core.sh): added description to func check_omx Signed-off-by: Stephan Wendel <[email protected]> commit 7525b15 Author: Stephan Wendel <[email protected]> Date: Wed Jan 5 12:53:48 2022 +0100 feat(omx): added check for omx features Added func check_omx to libs.core.sh Spits out 1 if omx available, else 0 Added func provides_omx_msg to libs/messages.sh Writes a message for omx availability to log Signed-off-by: Stephan Wendel <[email protected]> commit 8eb86d7 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 22:40:12 2022 +0100 feature(rtsp)!: replaced v4l2rtspserver with rtsp-simple-server Currently WIP, not working!. Only preparation for change. BREAKING CHANGE: v4l2rtspserver will not longer function! Signed-off-by: Stephan Wendel <[email protected]> commit 1ef2824 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 21:56:38 2022 +0100 refactor(raspicam)!: moved detection of raspicam devices Moved detection of raspicam devis in reusable function BREAKING CHANGE: detection in stream services must use new function Signed-off-by: Stephan Wendel <[email protected]> commit 04b6de9 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 20:15:05 2022 +0100 refactor(sample_configs): removed deprecated streamer parameter Replaced parameter streamer with new parameter mode Signed-off-by: Stephan Wendel <[email protected]> commit 641418e Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 20:10:06 2022 +0100 refactor(sample_configs): removed KwadFan_sample.conf Signed-off-by: Stephan Wendel <[email protected]> commit 5494483 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 20:04:16 2022 +0100 refactor(init_stream.sh)!: refactored function construct_streamer Prepared function for new stream services Switched to 'case' instead 'if elif else' for easier maintenance. BREAKING CHANGE: Only ustreamer runs at this point! Signed-off-by: Stephan Wendel <[email protected]> commit 4b8a4b9 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 19:58:29 2022 +0100 refactor(configparser.sh): refactored function check_section Now comparing arrays instead plain variables this should also improve perfomance Changed streamer to mode in must_exist variable Signed-off-by: Stephan Wendel <[email protected]> commit 112a4a0 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 19:53:48 2022 +0100 feat(logging.sh): create logfile if not present * This should prevent complaining about missing logfile. Signed-off-by: Stephan Wendel <[email protected]> commit 63dda4b Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 19:50:40 2022 +0100 feat(logging.sh): added function debug_msg * Added debug_msg for easier debugging during development Signed-off-by: Stephan Wendel <[email protected]> commit 9585ebe Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 19:47:39 2022 +0100 style(ustreamer.sh): removed unnecessary blank line Signed-off-by: Stephan Wendel <[email protected]> commit 86f31f4 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 19:43:16 2022 +0100 feat(messages.sh): added 'unknown_mode_msg' * Added Message to warn User that 'mode' isnt set. Signed-off-by: Stephan Wendel <[email protected]> commit 886c1ef Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 16:25:21 2022 +0100 refactor(messages.sh): changed deprecated_msg_1 * Changed message according to new behavior. Will exit if missing. Signed-off-by: Stephan Wendel <[email protected]> commit 4c70a69 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 16:22:49 2022 +0100 refactor(ustreamer.sh): removed check_section * Moved check_section to init_stream.sh Signed-off-by: Stephan Wendel <[email protected]> commit d834a0c Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 11:10:08 2022 +0100 style(messages.sh): refactored func deprecated_msg_1 * "Switching to fallback mode" instead "Switching mode to fallback" Signed-off-by: Stephan Wendel <[email protected]> commit e388027 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 10:57:49 2022 +0100 feat(messages.sh): added func deprecated_msg_1 * This function logs message about deprecated streamer parameter in webcam.conf Signed-off-by: Stephan Wendel <[email protected]> commit a30481b Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 10:34:24 2022 +0100 fix(core.sh): fixes error message instead of found message * Used reversed Output, leads to Error Message even * if binary found. * Cleaned out quotes from array 'paths' Signed-off-by: Stephan Wendel <[email protected]> commit 9139057 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 09:38:29 2022 +0100 refactor(v4l2_control.sh): cleaned empty line Signed-off-by: Stephan Wendel <[email protected]> commit a2c4eb9 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 09:35:30 2022 +0100 refactor(configparser.sh): changed behavior of func get_param * get_param now spits out empty line if parameter not found. Signed-off-by: Stephan Wendel <[email protected]> commit 95ac644 Author: Stephan Wendel <[email protected]> Date: Mon Jan 3 09:21:28 2022 +0100 fix(core.sh): critical typo in core.sh * Critical Bug leads to output binaries in stdout. Signed-off-by: Stephan Wendel <[email protected]> commit 091e983 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 18:32:06 2022 +0100 fix(config): added ffmpeg to crowsnest dependencies * ffmpeg is used by rtsp-simple-server Signed-off-by: Stephan Wendel <[email protected]> commit b832108 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 17:58:33 2022 +0100 fix(ustreamer.sh): fixed path to new binary location. * ustreamer binary now inside 'crowsnest' folder. Signed-off-by: Stephan Wendel <[email protected]> commit 5a19d50 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 17:53:37 2022 +0100 refactor(core.sh): added scriptpath in function check_apps * Should prevent unknown path errors Signed-off-by: Stephan Wendel <[email protected]> commit 325e6bc Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 17:48:19 2022 +0100 fix(core.sh): fixed typo in libs/core.sh * replaced echo with log_msg in L#86,88 Signed-off-by: Stephan Wendel <[email protected]> commit ce897ed Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 17:36:44 2022 +0100 fix(core.sh): added call function check_apps * Fixes initial_check, now calls function check_apps Signed-off-by: Stephan Wendel <[email protected]> commit 530d037 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 17:25:34 2022 +0100 feat(core.sh): added dependency check for apps * Checks if Apps are build. Signed-off-by: Stephan Wendel <[email protected]> commit 58aada7 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 14:31:22 2022 +0100 build(rtsp-simple-server): refactored Makefile * Implemented version control via 'version' file Signed-off-by: Stephan Wendel <[email protected]> commit 44798c6 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 14:23:48 2022 +0100 fix: removed rtsp-simple-server from submodules Signed-off-by: Stephan Wendel <[email protected]> commit d316e80 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 14:14:11 2022 +0100 chore: Updated .gitignore * Updated .gitignore to prepare for version file Signed-off-by: Stephan Wendel <[email protected]> commit 254b5b3 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 13:59:02 2022 +0100 docs(README): Updated readme * Updated README.md to match latest Changes. Signed-off-by: Stephan Wendel <[email protected]> commit fd4bbf4 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 13:45:35 2022 +0100 refactor: refactored tools/update.sh * Modified to match latest Changes in Install and Environment Signed-off-by: Stephan Wendel <[email protected]> commit 71b5584 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 12:52:05 2022 +0100 fix!: webcamd refuses to start after 3 Restarts * Changed StartLimitBurst to 10 * Changed StartLimitInterval to 180s * Changed Type to exec * Changed RestartSec on failure to 5 Signed-off-by: Stephan Wendel <[email protected]> commit 0d6fa43 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 12:46:55 2022 +0100 fix: Typo in install.sh * Line to stop existing webcamd was commented out. Signed-off-by: Stephan Wendel <[email protected]> commit 80e4298 Author: Stephan Wendel <[email protected]> Date: Sun Jan 2 02:44:09 2022 +0100 build!: Refactored Install,Uninstall and Update Chain. * Uses now make for easier Usage trough Users. * Updated Headers of multiple files, email address was missing. * Clean: removed no longer needed buster-backports.list. * Added configuration file for bcm2835-v4l2 Module. See https://github.com/pikvm/ustreamer#raspberry-pi-camera-example * Modified config file according to Install Changes. * Updated .editorconfig for Makefile,markdown,json and yaml files. * Refactored bin/Makefile BREAKING CHANGE: Uses make to install, uninstall and update now! Signed-off-by: Stephan Wendel <[email protected]> commit 5a64bc1 Author: Stephan Wendel <[email protected]> Date: Sat Jan 1 15:02:35 2022 +0100 refactor!: Removed no longer used v4l2rtspserver from custompios module. * v4l2rtspserver will be replaced by rtsp-simple-server. BREAKING CHANGE: v4l2rtspserver config removed Signed-off-by: Stephan Wendel <[email protected]> commit 9c0c3b4 Author: Stephan Wendel <[email protected]> Date: Sat Jan 1 14:59:02 2022 +0100 refactor: Removed Version from webcamd * Removed Version from webcamd * To prepare use of Verion File Signed-off-by: Stephan Wendel <[email protected]> commit f253f93 Author: Stephan Wendel <[email protected]> Date: Fri Dec 31 13:23:20 2021 +0100 chore!: Added used Stream Services as Submodules. * Added used Stream Services as Submodules for easier maintenance. * Added Makefile to build Stream Services * Added and modified .gitmodules file * Updated .editorconfig * Modified .gitignore to prevent pristine state in moonrakers Update Manager BREAKING CHANGE: crowsnest has to be uninstalled and reinstalled! Signed-off-by: Stephan Wendel <[email protected]> commit 5407896 Author: Stephan Wendel <[email protected]> Date: Thu Dec 30 12:05:51 2021 +0100 chore!: Renamed patcher.sh to update.sh BREAKING CHANGE: Please use update.sh instead patcher.sh in future updates! * Renamed to be more precise in what it is made for. Signed-off-by: Stephan Wendel <[email protected]> commit 18b75f4 Author: Stephan Wendel <[email protected]> Date: Wed Dec 29 08:25:48 2021 +0100 style(watchdog.sh): Reformatted func get_conf_devices Signed-off-by: Stephan Wendel <[email protected]> commit ec2340f Author: Stephan Wendel <[email protected]> Date: Sun Dec 19 13:47:36 2021 +0100 FEATURE: Zip Release: Upload Repo as zip to assets Signed-off-by: Stephan Wendel <[email protected]> commit 5f8da47 Author: Stephan Wendel <[email protected]> Date: Sun Dec 19 13:21:15 2021 +0100 REFACTOR: Bumped CODE_OF_CONDUCT to V2.1 * See https://www.contributor-covenant.org/version/2/1/code_of_conduct/ Signed-off-by: Stephan Wendel <[email protected]> commit c05408a Author: Stephan Wendel <[email protected]> Date: Sun Dec 19 13:18:29 2021 +0100 IMPROVE: Run shellcheck workflow only if shellscript pushed. Signed-off-by: Stephan Wendel <[email protected]> Signed-off-by: Stephan Wendel <[email protected]>
1 parent 8a3ce98 commit 0c0df27

37 files changed

+1372
-552
lines changed

.editorconfig

+35-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,45 @@
11
# Editor Config
22
# This should help contributors and save time for my sometimes cheesy Brain xD
3-
# Stephan Wendel <[email protected]>
43

5-
[*.sh]
4+
#### webcamd - A webcam Service for multiple Cams and Stream Services.
5+
####
6+
#### Written by Stephan Wendel aka KwadFan <[email protected]>
7+
#### Copyright 2021
8+
#### https://github.com/mainsail-crew/crowsnest
9+
####
10+
#### This File is distributed under GPLv3
11+
####
12+
13+
root = true
14+
15+
[*]
616
charset = utf-8
717
end_of_line = lf
18+
trim_trailing_whitespace = true
819
insert_final_newline = true
20+
max_line_length = 125
921
indent_style = space
1022
indent_size = 4
11-
trim_trailing_whitespace = true
1223

13-
[*.md]
14-
charset = utf-8
24+
[*.sh]
25+
# According to Linux Kernel line lenght.
26+
# Try to stay at max lenght of 80 characters
27+
max_line_length = 100
28+
29+
[*.{md,markdown}]
1530
insert_final_newline = true
16-
end_of_line = lf
17-
trim_trailing_whitespace = true
31+
trim_trailing_whitespace = false
32+
33+
[{Makefile,**.mk}]
34+
indent_style = tab
35+
36+
[*.{json,yml,yaml}]
37+
indent_style = space
38+
indent_size = 2
39+
40+
# HTML related
41+
[*.{html,css,js}]
42+
indent_style = space
43+
indent_size = 2
44+
45+

.github/CODE_OF_CONDUCT.md

+124-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,132 @@
1+
# Contributor Covenant Code of Conduct
12

2-
# Contributor Code of Conduct
3+
## Our Pledge
34

4-
As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
511

6-
We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
714

8-
Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
15+
## Our Standards
916

10-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
1119

12-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
- Focusing on what is best not just for us as individuals, but for the overall
26+
community
1327

14-
This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html
28+
Examples of unacceptable behavior include:
1529

30+
- The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
- Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[INSERT CONTACT METHOD].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series of
86+
actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or permanent
93+
ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within the
113+
community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.1, available at
119+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120+
121+
Community Impact Guidelines were inspired by
122+
[Mozilla's code of conduct enforcement ladder][mozilla coc].
123+
124+
For answers to common questions about this code of conduct, see the FAQ at
125+
[https://www.contributor-covenant.org/faq][faq]. Translations are available at
126+
[https://www.contributor-covenant.org/translations][translations].
127+
128+
[homepage]: https://www.contributor-covenant.org
129+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130+
[mozilla coc]: https://github.com/mozilla/diversity
131+
[faq]: https://www.contributor-covenant.org/faq
132+
[translations]: https://www.contributor-covenant.org/translations

.github/workflows/shellcheck.yml

+8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@ on:
22
push:
33
branches:
44
- '**'
5+
paths:
6+
- '**.sh'
7+
- 'webcamd'
8+
- 'libs/**'
59
pull_request:
610
branches:
711
- 'master'
12+
paths:
13+
- '**.sh'
14+
- 'webcamd'
15+
- 'libs/**'
816

917
name: 'Check Script'
1018

.gitignore

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
#### webcamd - A webcam Service for multiple Cams and Stream Services.
2+
####
3+
#### Written by Stephan Wendel aka KwadFan <[email protected]>
4+
#### Copyright 2021
5+
#### https://github.com/mainsail-crew/crowsnest
6+
####
7+
#### This File is distributed under GPLv3
8+
####
9+
110
#Ignore ERRORS.txt
211
ERRORS.txt
312

@@ -8,4 +17,8 @@ leftover*
817
test*
918

1019
# tmp file workaround
11-
lost*
20+
lost*
21+
22+
# Ignore rtsp-simple-server binary
23+
bin/rtsp-simple-server/rtsp*
24+
bin/rtsp-simple-server/*.yml

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "bin/ustreamer"]
2+
path = bin/ustreamer
3+
url = https://github.com/pikvm/ustreamer
4+
branch = master
5+
ignore = untracked
6+

Makefile

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#### webcamd - A webcam Service for multiple Cams and Stream Services.
2+
####
3+
#### Written by Stephan Wendel aka KwadFan <[email protected]>
4+
#### Copyright 2021
5+
#### https://github.com/mainsail-crew/crowsnest
6+
####
7+
#### This File is distributed under GPLv3
8+
####
9+
10+
.PHONY: help install unsinstall build buildclean uninstallgo update
11+
12+
# Setup
13+
USER = $(shell whoami)
14+
BIN_FOLDER = bin
15+
16+
all: help
17+
18+
help:
19+
@echo "This is intended to install crowsnest."
20+
@echo ""
21+
@echo "Some Parts need 'sudo' privileges."
22+
@echo "You'll be asked for password, if needed."
23+
@echo ""
24+
@echo " Usage: make [action]"
25+
@echo ""
26+
@echo " Available actions:"
27+
@echo ""
28+
@echo " install Installs crowsnest"
29+
@echo " uninstall Uninstalls crowsnest"
30+
@echo " update Updates crowsnest (if needed)"
31+
@echo " build builds binaries"
32+
@echo " buildclean cleans binaries (for recompile)"
33+
@echo ""
34+
35+
install:
36+
@bash -c tools/install.sh
37+
38+
uninstall:
39+
@bash -c tools/uninstall.sh
40+
41+
update:
42+
@bash -c tools/update.sh
43+
44+
build:
45+
@git submodule update
46+
$(MAKE) -C $(BIN_FOLDER)
47+
48+
buildclean:
49+
$(MAKE) -C $(BIN_FOLDER) clean
50+
51+

0 commit comments

Comments
 (0)