Skip to content

Commit 2031fb8

Browse files
committed
Move helpers and control to /usr/local/bin
Allows to call them without specifying the path. As suggested by @TheSin-
1 parent 6ee2efc commit 2031fb8

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

scripts/10-install-camera-streamer

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ cp /files/camera-streamer/libcamera.conf /boot/camera-streamer/libcamera.conf
3030
cp /files/camera-streamer/usb-default.conf /boot/camera-streamer/usb-default.conf
3131

3232
# install services
33-
cp /files/camera-streamer/camera-streamer-control /root/bin/camera-streamer-control
34-
chmod +x /root/bin/camera-streamer-control
33+
cp /files/camera-streamer/camera-streamer-control /usr/local/bin/camera-streamer-control
34+
chmod +x /usr/local/bin/camera-streamer-control
3535

3636
cp /files/camera-streamer/camera-streamer*.service /etc/systemd/system/
3737
chmod -x /etc/systemd/system/camera-streamer*.service
@@ -40,12 +40,12 @@ chmod -x /etc/systemd/system/camera-streamer*.service
4040
systemctl enable camera-streamer.service
4141

4242
# install helper scripts
43-
cp /files/camera-streamer/add-usb-camera /root/bin/add-usb-camera
44-
cp /files/camera-streamer/remove-usb-camera /root/bin/remove-usb-camera
45-
cp /files/camera-streamer/list-usb-cameras /root/bin/list-usb-cameras
46-
chmod +x /root/bin/add-usb-camera
47-
chmod +x /root/bin/remove-usb-camera
48-
chmod +x /root/bin/list-usb-cameras
43+
cp /files/camera-streamer/add-usb-camera /usr/local/bin/add-usb-camera
44+
cp /files/camera-streamer/remove-usb-camera /usr/local/bin/remove-usb-camera
45+
cp /files/camera-streamer/list-usb-cameras /usr/local/bin/list-usb-cameras
46+
chmod +x /usr/local/bin/add-usb-camera
47+
chmod +x /usr/local/bin/remove-usb-camera
48+
chmod +x /usr/local/bin/list-usb-cameras
4949

5050
# clean up the old stuff
5151
cat > /boot/octopi.txt <<EOF

scripts/files/camera-streamer/add-usb-camera

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ FRAMERATE=15
8686
OPTIONS=
8787
EOF
8888

89-
/root/bin/camera-streamer-control restart $NAME
89+
/usr/local/bin/camera-streamer-control restart $NAME
9090

9191
echo "Camera $NAME added"
9292
echo

scripts/files/camera-streamer/camera-streamer.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ConditionPathExists=/etc/octopi_streamer/mjpeg
55

66
[Service]
77
Type=oneshot
8-
ExecStart=/root/bin/camera-streamer-control start
9-
ExecStop=/root/bin/camera-streamer-control stop
10-
ExecReload=/root/bin/camera-streamer-control restart
8+
ExecStart=/usr/local/bin/camera-streamer-control start
9+
ExecStop=/usr/local/bin/camera-streamer-control stop
10+
ExecReload=/usr/local/bin/camera-streamer-control restart
1111
RemainAfterExit=yes
1212
KillMode=mixed
1313
TimeoutStopSec=10

scripts/files/camera-streamer/remove-usb-camera

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ ! -e "/boot/camera-streamer/usb-$NAME.conf" ]; then
1717
exit 1
1818
fi
1919

20-
/root/bin/camera-streamer-control stop $NAME
20+
/usr/local/bin/camera-streamer-control stop $NAME
2121

2222
rm /boot/camera-streamer/usb-$NAME.conf
2323
rm /run/systemd/system/camera-streamer-usb-$NAME.path || true

0 commit comments

Comments
 (0)