diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d616a..43b40ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.3.7 2022-06-23 + + ### Changed + - Allow overrides to actually override with the restore script + + ## 3.3.6 2022-06-23 ### Changed diff --git a/install/usr/local/bin/restore b/install/usr/local/bin/restore index 0c1de9f..ffb890f 100755 --- a/install/usr/local/bin/restore +++ b/install/usr/local/bin/restore @@ -829,11 +829,7 @@ print_debug "Filename to recover '${r_filename}'" ## Question Database Type if [ -n "${2}" ]; then - if [ ! -f "${2}" ]; then - get_dbtype - else - r_dbtype="${2}" - fi + r_dbtype="${2}" else get_dbtype fi @@ -841,11 +837,7 @@ print_debug "Database type '${r_dbtype}'" ## Question Database Host if [ -n "${3}" ]; then - if [ ! -f "${3}" ]; then - get_dbhost - else - r_dbhost="${3}" - fi + r_dbhost="${3}" else get_dbhost fi @@ -853,11 +845,7 @@ print_debug "Database Host '${r_dbhost}'" ## Question Database Name if [ -n "${4}" ]; then - if [ ! -f "${4}" ]; then - get_dbname - else - r_dbname="${4}" - fi + r_dbname="${4}" else get_dbname fi @@ -865,11 +853,7 @@ print_debug "Database Name '${r_dbname}'" ## Question Database User if [ -n "${5}" ]; then - if [ ! -f "${5}" ]; then - get_dbuser - else - r_dbuser="${5}" - fi + r_dbuser="${5}" else get_dbuser fi @@ -877,11 +861,7 @@ print_debug "Database User '${r_dbuser}'" ## Question Database Password if [ -n "${6}" ]; then - if [ ! -f "${6}" ]; then - get_dbpass - else - r_dbpass="${6}" - fi + r_dbpass="${6}" else get_dbpass fi @@ -889,11 +869,7 @@ print_debug "Database Pass '${r_dbpass}'" ## Question Database Port if [ -n "${7}" ]; then - if [ ! -f "${7}" ]; then - get_dbport - else - r_dbport="${7}" - fi + r_dbport="${7}" else get_dbport fi