From cf20fc3c4868cbc856bf5311a31aec3869ab834d Mon Sep 17 00:00:00 2001 From: James Hildebrand Date: Mon, 24 May 2021 16:57:21 -0700 Subject: [PATCH 1/4] Issue 85 fix --- scripts/install_mjpg-streamer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_mjpg-streamer.sh b/scripts/install_mjpg-streamer.sh index 1551081..8e940e4 100755 --- a/scripts/install_mjpg-streamer.sh +++ b/scripts/install_mjpg-streamer.sh @@ -1,7 +1,7 @@ ### base variables SYSTEMDDIR="/etc/systemd/system" -WEBCAMD_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/home/root/bin/webcamd" -WEBCAM_TXT_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/boot/mainsail.txt" +WEBCAMD_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/root/usr/local/bin/webcamd" +WEBCAM_TXT_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/home/pi/klipper-config/webcam.txt" install_mjpg-streamer(){ ### checking dependencies From 8abda56749154b3acf62d145b1938a24a38fc0f9 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Tue, 25 May 2021 12:04:13 +0200 Subject: [PATCH 2/4] fix: typo in WEBCAM_TXT_SRC --- scripts/install_mjpg-streamer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_mjpg-streamer.sh b/scripts/install_mjpg-streamer.sh index 8e940e4..0769446 100755 --- a/scripts/install_mjpg-streamer.sh +++ b/scripts/install_mjpg-streamer.sh @@ -1,7 +1,7 @@ ### base variables SYSTEMDDIR="/etc/systemd/system" WEBCAMD_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/root/usr/local/bin/webcamd" -WEBCAM_TXT_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/home/pi/klipper-config/webcam.txt" +WEBCAM_TXT_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/home/pi/klipper_config/webcam.txt" install_mjpg-streamer(){ ### checking dependencies From 9e0cdb0715d6a5382af8b66210e5471b351a3a92 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Tue, 25 May 2021 12:13:36 +0200 Subject: [PATCH 3/4] fix: remove webcamd file when removing mjpgstreamer --- scripts/remove.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/remove.sh b/scripts/remove.sh index 604fe42..326c5b3 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -399,6 +399,11 @@ remove_mjpg-streamer(){ ok_msg "MJPG-Streamer Service removed!" fi + ### remove webcamd from /usr/local/bin + if [ -e "/usr/local/bin/webcamd" ]; then + sudo rm -f "/usr/local/bin/webcamd" + fi + ### remove MJPG-Streamer directory if [ -d ${HOME}/mjpg-streamer ]; then status_msg "Removing MJPG-Streamer directory ..." From 11b3d7a9618f44039c96a95e0a5140414a64f4ac Mon Sep 17 00:00:00 2001 From: th33xitus Date: Tue, 25 May 2021 12:15:01 +0200 Subject: [PATCH 4/4] fix: replace config dir in webcamd file --- scripts/install_mjpg-streamer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_mjpg-streamer.sh b/scripts/install_mjpg-streamer.sh index 0769446..fc59f15 100755 --- a/scripts/install_mjpg-streamer.sh +++ b/scripts/install_mjpg-streamer.sh @@ -49,8 +49,8 @@ install_mjpg-streamer(){ EOT sudo wget $WEBCAMD_SRC -O "/usr/local/bin/webcamd" + sudo sed -i "/^config_dir=/ s|=.*|=$klipper_cfg_loc|" /usr/local/bin/webcamd sudo sed -i "/MJPGSTREAMER_HOME/ s/pi/${USER}/" /usr/local/bin/webcamd - sudo sed -i "/^cfg_files+=/ s|=.*|=$WEBCAM_TXT|" /usr/local/bin/webcamd sudo chmod +x /usr/local/bin/webcamd ### step 4: create webcam.txt config file