Move scripts to /usr/bin

Author: foosel

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all systemd scripts configs
 
-PREFIX := /usr/local
+PREFIX := /usr
 
 SCRIPTS_DIR := $(PREFIX)/bin
 SYSTEMD_DIR := /etc/systemd/system

README.md

@@ -17,7 +17,7 @@ make install
 Available config options for `make`:
 
 - `DESTDIR` (default: unset, use this to have `make install` copy things to a build folder or something similar)
-- `PREFIX` (default: `/usr/local`)
+- `PREFIX` (default: `/usr`)
 - `SCRIPTS_DIR` (default: `$(PREFIX)/bin`)
 - `SYSTEMD_DIR` (default: `/etc/systemd/system`)
 - `CONFIG_DIR` (default: `/etc/camera-streamer.conf.d`)

scripts/add-usb-camera

@@ -10,7 +10,7 @@ PORT=$2
 DEVICE=$3
 
 CONFIG_DIR=/etc/camera-streamer.conf.d
-CONTROL=/usr/local/bin/camera-streamer-control
+CONTROL=/usr/bin/camera-streamer-control
 
 ## Name
 

scripts/camera-streamer-control

@@ -8,6 +8,8 @@ fi
 action=$1
 single=$2
 
+CONFIG_DIR=/etc/camera-streamer.conf.d
+
 run-action() {
   unit=$1
   echo "Running $action for $unit..."
@@ -41,7 +43,7 @@ if [ -z "$single" ] || [[ "$single" == "libcamera" ]]; then
 fi
 
 # iterate over all the camera confs in /boot/camera-streamer
-for conf in /etc/camera-streamer.conf.d/usb-*.conf; do
+for conf in $CONFIG_DIR/usb-*.conf; do
   # get the name of the camera
   name=$(basename "$conf" .conf)
   name=${name#usb-}

scripts/remove-usb-camera

@@ -8,7 +8,7 @@ fi
 NAME=$1
 
 CONFIG_DIR=/etc/camera-streamer.conf.d
-CONTROL=/usr/local/bin/camera-streamer-control
+CONTROL=/usr/bin/camera-streamer-control
 
 if [ -z "$NAME" ]; then
   echo "Usage: $0 <name>"

systemd/camera-streamer.service

@@ -4,9 +4,9 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/camera-streamer-control start
-ExecStop=/usr/local/bin/camera-streamer-control stop
-ExecReload=/usr/local/bin/camera-streamer-control restart
+ExecStart=/usr/bin/camera-streamer-control start
+ExecStop=/usr/bin/camera-streamer-control stop
+ExecReload=/usr/bin/camera-streamer-control restart
 RemainAfterExit=yes
 KillMode=mixed
 TimeoutStopSec=10