From c739bd799e47556b7472a14ca3e43ed5b8b441c2 Mon Sep 17 00:00:00 2001 From: Dolf Starreveld Date: Thu, 1 Dec 2016 01:33:49 -0800 Subject: [PATCH] Corrections as requested in pull request --- README.md | 3 --- prep.sh | 11 ++++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f0ddcfd..bbd3a96 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # Introduction -*Note*: Moonfire NVR is currently being rewritten from C++ into Rust. The text -below describes the C++ version. See also the "rust" branch. - Moonfire NVR is an open-source security camera network video recorder, started by Scott Lamb <>. It saves H.264-over-RTSP streams from IP cameras to disk into a hybrid format: video frames in a directory on diff --git a/prep.sh b/prep.sh index b226fe5..929b0cc 100755 --- a/prep.sh +++ b/prep.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # # This file is part of Moonfire NVR, a security camera network video recorder. # Copyright (C) 2016 Scott Lamb @@ -158,13 +158,18 @@ if [ ! -x "${SERVICE_BIN}" ]; then echo exit 1 fi - RUST_TEST_THREADS=1 cargo test - if ! cargo build --release; then + if ! RUST_TEST_THREADS=1 cargo test; then echo "test failed. Try to run the following manually for more info" echo "RUST_TEST_THREADS=1 cargo test --verbose" echo exit 1 fi + if ! cargo build --release; then + echo "Build failed." + echo "RUST_TEST_THREADS=1 cargo build --release --verbose" + echo + exit 1 + fi sudo install -m 755 target/release/moonfire-nvr ${SERVICE_BIN} if [ -x "${SERVICE_BIN}" ]; then echo "Binary installed..."; echo