diff --git a/Cargo.lock b/Cargo.lock index 537dd87a5b557b4ebf96ec2772c7fadac678fb25..da09b26f7d4311ba0d81d18cf0d0abe47f8a4afc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -216,7 +216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "cats-sdr-igate" +name = "cats-sdr-igate-decoder" version = "0.1.0" dependencies = [ "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 6eea815f5c85c6158937e230039aae3afe50ece1..34579c2465bca8bee198897cc08457ec29da4758 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cats-sdr-igate" +name = "cats-sdr-igate-decoder" version = "0.1.0" edition = "2021" license = "MIT OR LGPL-2.1-only" @@ -8,14 +8,16 @@ description = "An RX-only SDR CATS I-gate" [package.metadata.deb] assets = [ - ["target/release/cats-igate", "usr/bin/", "755"], - ["debian/cats-igate.service", "/lib/systemd/system/cats-igate.service", "644"], - ["config.example.toml", "/etc/cats_igate/config.toml", "644"] + ["target/release/cats-sdr-igate-decoder", "/usr/bin/", "755"], + ["debian/cats-sdr-igate.service", "/lib/systemd/system/cats-sdr-igate.service", "644"], + ["config.example.toml", "/etc/cats_sdr_igate/config.toml", "644"], + ["debian/start.sh", "/usr/bin/cats_sdr_igate", "755"] ] -conf-files = ["/etc/cats_igate/config.toml"] +conf-files = ["/etc/cats_sdr_igate/config.toml"] maintainer-scripts = "debian/maintainer_scripts/" -copyright = "2023, Stephen D <@stephen:crabsin.space>" +copyright = "2024, Stephen D <@stephen:crabsin.space>" maintainer = "Stephen D <@stephen:crabsin.space>" +depends = "$auto, rtl-sdr" [dependencies] anyhow = "1.0.75" diff --git a/debian/cats-igate.service b/debian/cats-sdr-igate.service similarity index 66% rename from debian/cats-igate.service rename to debian/cats-sdr-igate.service index 813549a04878e14accebbc8757daf1d756bf528d..da401a945e465d155a2a5c7ec5024839c222f001 100644 --- a/debian/cats-igate.service +++ b/debian/cats-sdr-igate.service @@ -1,14 +1,14 @@ [Unit] -Description=CATS Igate +Description=CATS SDR I-Gate After=syslog.target network-online.target nss-lookup.target [Service] -PIDFile=/run/cats-igate.pid -ExecStart=/usr/bin/cats-igate +PIDFile=/run/cats-sdr-igate.pid +ExecStart=/usr/bin/cats-sdr-igate ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s QUIT $MAINPID PrivateTmp=true -User=cats-igate +User=cats-sdr-igate Restart=on-failure [Install] diff --git a/debian/maintainer_scripts/postinst b/debian/maintainer_scripts/postinst index cabb73991db987e97cc2c7053100ba5dcd6fb389..10856b61f7d66ce235aa32a2a8fcd96cd0fa9060 100644 --- a/debian/maintainer_scripts/postinst +++ b/debian/maintainer_scripts/postinst @@ -1,3 +1 @@ -adduser --system --system cats-igate -usermod -G spi -a cats-igate -usermod -G gpio -a cats-igate +adduser --system --system cats-sdr-igate diff --git a/debian/start.sh b/debian/start.sh new file mode 100644 index 0000000000000000000000000000000000000000..d2c46190c7019f785d44d68855f096fa7b152cf7 --- /dev/null +++ b/debian/start.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +rtl_fm -M raw -F9 -p 0 -d 0 -s 48000 -f 430500000 - 2>/dev/null | /usr/bin/cats-sdr-igate-decoder diff --git a/start.sh b/start.sh index 1394e1182b675617ce4ed8f8f825cc140872d67f..de4ab654a0a16bfd9d89978d45a756a3e28832b3 100755 --- a/start.sh +++ b/start.sh @@ -1,9 +1,3 @@ #!/bin/sh -set -euo pipefail - -BINARY="target/release/cats-sdr-igate" - -cargo build --release - -rtl_fm -M raw -F9 -p 0 -d 0 -s 48000 -f 430500000 - 2>/dev/null | $BINARY +rtl_fm -M raw -F9 -p 0 -d 0 -s 48000 -f 430500000 - 2>/dev/null | target/release/cats-sdr-igate-decoder