Browse Source

Exit if upgrade fails

Bob Mottram 8 years ago
parent
commit
cf4e137c25
2 changed files with 6 additions and 2 deletions
  1. 4
    0
      src/freedombone-upgrade
  2. 2
    2
      src/freedombone-utils-web

+ 4
- 0
src/freedombone-upgrade View File

91
         fi
91
         fi
92
 
92
 
93
         ${PROJECT_NAME} -c $CONFIGURATION_FILE
93
         ${PROJECT_NAME} -c $CONFIGURATION_FILE
94
+        if [ ! "$?" = "0" ]; then
95
+            lockdown_permissions
96
+            exit 453536
97
+        fi
94
 
98
 
95
         lockdown_permissions
99
         lockdown_permissions
96
     fi
100
     fi

+ 2
- 2
src/freedombone-utils-web View File

167
         TEST_DOMAIN_NAME=$1
167
         TEST_DOMAIN_NAME=$1
168
         function_check validate_domain_name
168
         function_check validate_domain_name
169
         validate_domain_name
169
         validate_domain_name
170
-        if [[ $TEST_DOMAIN_NAME != $1 ]]; then
171
-            echo $TEST_DOMAIN_NAME
170
+        if [[ $TEST_DOMAIN_NAME != $1 && $TEST_DOMAIN_NAME != 'ttrss' ]]; then
171
+            echo $"Invalid domain name $TEST_DOMAIN_NAME"
172
             exit 8528
172
             exit 8528
173
         fi
173
         fi
174
     fi
174
     fi