File tree Expand file tree Collapse file tree 3 files changed +26
-4
lines changed
Expand file tree Collapse file tree 3 files changed +26
-4
lines changed Original file line number Diff line number Diff line change 44# Declare Variables before exporting.
55# See https://www.shellcheck.net/wiki/SC2155
66
7- BASE_IMAGE_ENLARGEROOT=3000
7+ BASE_IMAGE_ENLARGEROOT=4500
88BASE_IMAGE_RESIZEROOT=600
99# Compress not needed due compression done in workflow
1010BASE_RELEASE_COMPRESS=no
Original file line number Diff line number Diff line change 22# ### crowsnest - A webcam Service for multiple Cams and Stream Services.
33# ###
44# ### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
5- # ### Copyright 2021 - 2022
5+ # ### Copyright 2021 - till today
66# ### https://github.com/mainsail-crew/crowsnest
77# ###
88# ### This File is distributed under GPLv3
1818[[ -n " $CROWSNEST_CONFIG_PATH " ]] || CROWSNEST_CONFIG_PATH=" /home/${BASE_USER} /printer_data/config"
1919[[ -n " $CROWSNEST_LOG_PATH " ]] || CROWSNEST_LOG_PATH=" /home/${BASE_USER} /printer_data/logs"
2020[[ -n " $CROWSNEST_ENV_PATH " ]] || CROWSNEST_ENV_PATH=" /home/${BASE_USER} /printer_data/systemd"
21- [[ -n " $CROWSNEST_RASPICAMFIX " ]] || CROWSNEST_RASPICAMFIX=" 1"
2221[[ -n " $CROWSNEST_ADD_CROWSNEST_MOONRAKER " ]] || CROWSNEST_ADD_CROWSNEST_MOONRAKER=" 1"
2322[[ -n " $CROWSNEST_MOONRAKER_CONF_PATH " ]] || CROWSNEST_MOONRAKER_CONF_PATH=" /home/${BASE_USER} /printer_data/config/moonraker.conf"
2423
2726[[ -n " $CROWSNEST_USTREAMER_REPO_SHIP " ]] || CROWSNEST_USTREAMER_REPO_SHIP=" https://github.com/pikvm/ustreamer.git"
2827[[ -n " $CROWSNEST_USTREAMER_REPO_BRANCH " ]] || CROWSNEST_USTREAMER_REPO_BRANCH=" master"
2928
29+ # camera-streamer
30+ [[ -n " $CROWSNEST_CAMERA_STREAMER_REPO_SHIP " ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP=" https://github.com/ayufan/camera-streamer.git"
31+ [[ -n " $CROWSNEST_CAMERA_STREAMER_REPO_BRANCH " ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH=" master"
32+
3033# ##########################################################################
3134# ## DO NOT EDIT BELOW THIS LINE, UNLESS YOU KNOW EXACTLY WHAT HAPPENDS! ###
3235# ##########################################################################
Original file line number Diff line number Diff line change @@ -20,7 +20,25 @@ install_cleanup_trap
2020
2121# Module only Variables
2222CN_BUILD_PACKAGE_FILE=" /tmp/cn_packages.lst"
23- CN_BUILD_INSTALL_SH=" /home/${BASE_USER} /crowsnest/tools/install.sh"
23+
24+ # Helper Func
25+ is_raspbian () {
26+ if [[ -f /boot/config.txt ]] && [[ -f /etc/rpi-issue ]]; then
27+ echo " 1"
28+ else
29+ echo " 0"
30+ fi
31+ }
32+
33+ get_pkglist () {
34+ if [[ " $( is_raspbian) " = " 1" ]]; then
35+ CN_BUILD_INSTALL_SH=" /home/${BASE_USER} /crowsnest/tools/libs/pkglist-rpi.sh"
36+ fi
37+ if [[ " $( is_raspbian) " = " 0" ]]; then
38+ CN_BUILD_INSTALL_SH=" /home/${BASE_USER} /crowsnest/tools/libs/pkglist-generic.sh"
39+ fi
40+ }
41+
2442
2543echo_green " Installing crowsnest ..."
2644
@@ -38,6 +56,7 @@ gitclone CROWSNEST_REPO crowsnest
3856
3957# # Step 3: grep PKGLIST from install.sh for dependencies
4058echo_green " Generating packages file ..."
59+ get_pkglist
4160grep " PKGLIST=" " ${CN_BUILD_INSTALL_SH} " >> " ${CN_BUILD_PACKAGE_FILE} "
4261
4362# # Step 4: Rename PKGLIST to Module usable Var
You can’t perform that action at this time.
0 commit comments