- Fix prep.sh script to exit on test failure

- Add prep.sh capabilty to read custom configuration from file prep.config (ignored in .gitignore) to keep script pristine
This commit is contained in:
Dolf Starreveld 2016-11-30 22:05:52 -08:00
parent 7d15a54a47
commit af7aa26709
2 changed files with 14 additions and 4 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ Cargo.lock
.settings .settings
*.swp *.swp
target target
prep.config

17
prep.sh
View File

@ -39,8 +39,12 @@
# #
# Configuration variables. Should only need minimal, or zero, changes. # Configuration variables. Should only need minimal, or zero, changes.
# Empty values will use defaults. # Empty values will use defaults. For convenience, we attempt to read
# customizations from prep.config first
# #
if [ -r prep.config ]; then
. prep.config
fi
# User and group # User and group
# Default: or whatever is in $NVR_USER (default "moonfire-nvr") # Default: or whatever is in $NVR_USER (default "moonfire-nvr")
@ -61,7 +65,7 @@
# Set to mountpoint of media directory, empty to stay in home directory # Set to mountpoint of media directory, empty to stay in home directory
# Default: empty # Default: empty
#SAMPLES_DIR= #SAMPLES_DIR=/media/nvr/samples
# Set to path for media directory relative to mountpoint # Set to path for media directory relative to mountpoint
# Default: "samples" # Default: "samples"
@ -71,7 +75,7 @@
# Binary location # Binary location
# Default: "/usr/local/bin/moonfire-nvr" # Default: "/usr/local/bin/moonfire-nvr"
# #
#SERVICE_BIN= SERVICE_BIN=/usr/local/bin/moonfire-nvr-rust
# Service name # Service name
# Default: "moonfire-nvr" # Default: "moonfire-nvr"
@ -155,7 +159,12 @@ if [ ! -x "${SERVICE_BIN}" ]; then
exit 1 exit 1
fi fi
RUST_TEST_THREADS=1 cargo test RUST_TEST_THREADS=1 cargo test
cargo build --release if ! cargo build --release; 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
sudo install -m 755 target/release/moonfire-nvr ${SERVICE_BIN} sudo install -m 755 target/release/moonfire-nvr ${SERVICE_BIN}
if [ -x "${SERVICE_BIN}" ]; then if [ -x "${SERVICE_BIN}" ]; then
echo "Binary installed..."; echo echo "Binary installed..."; echo