From cf4e137c25688c49e53c85b1275cab33b953f784 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 21 Dec 2016 21:51:56 +0000 Subject: [PATCH] Exit if upgrade fails --- src/freedombone-upgrade | 4 ++++ src/freedombone-utils-web | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade index 960a28b0..9af84589 100755 --- a/src/freedombone-upgrade +++ b/src/freedombone-upgrade @@ -91,6 +91,10 @@ if [ -d $PROJECT_DIR ]; then fi ${PROJECT_NAME} -c $CONFIGURATION_FILE + if [ ! "$?" = "0" ]; then + lockdown_permissions + exit 453536 + fi lockdown_permissions fi diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index 96729c01..58d50db2 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -167,8 +167,8 @@ function test_domain_name { TEST_DOMAIN_NAME=$1 function_check validate_domain_name validate_domain_name - if [[ $TEST_DOMAIN_NAME != $1 ]]; then - echo $TEST_DOMAIN_NAME + if [[ $TEST_DOMAIN_NAME != $1 && $TEST_DOMAIN_NAME != 'ttrss' ]]; then + echo $"Invalid domain name $TEST_DOMAIN_NAME" exit 8528 fi fi