Skip to content

Commit f005956

Browse files
committed
Release 3.3.7 - See CHANGELOG.md
1 parent ba20386 commit f005956

File tree

2 files changed

+12
-30
lines changed

2 files changed

+12
-30
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 3.3.7 2022-06-23 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Allow overrides to actually override with the restore script
5+
6+
17
## 3.3.6 2022-06-23 <dave at tiredofit dot ca>
28

39
### Changed

install/usr/local/bin/restore

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -829,71 +829,47 @@ print_debug "Filename to recover '${r_filename}'"
829829

830830
## Question Database Type
831831
if [ -n "${2}" ]; then
832-
if [ ! -f "${2}" ]; then
833-
get_dbtype
834-
else
835-
r_dbtype="${2}"
836-
fi
832+
r_dbtype="${2}"
837833
else
838834
get_dbtype
839835
fi
840836
print_debug "Database type '${r_dbtype}'"
841837

842838
## Question Database Host
843839
if [ -n "${3}" ]; then
844-
if [ ! -f "${3}" ]; then
845-
get_dbhost
846-
else
847-
r_dbhost="${3}"
848-
fi
840+
r_dbhost="${3}"
849841
else
850842
get_dbhost
851843
fi
852844
print_debug "Database Host '${r_dbhost}'"
853845

854846
## Question Database Name
855847
if [ -n "${4}" ]; then
856-
if [ ! -f "${4}" ]; then
857-
get_dbname
858-
else
859-
r_dbname="${4}"
860-
fi
848+
r_dbname="${4}"
861849
else
862850
get_dbname
863851
fi
864852
print_debug "Database Name '${r_dbname}'"
865853

866854
## Question Database User
867855
if [ -n "${5}" ]; then
868-
if [ ! -f "${5}" ]; then
869-
get_dbuser
870-
else
871-
r_dbuser="${5}"
872-
fi
856+
r_dbuser="${5}"
873857
else
874858
get_dbuser
875859
fi
876860
print_debug "Database User '${r_dbuser}'"
877861

878862
## Question Database Password
879863
if [ -n "${6}" ]; then
880-
if [ ! -f "${6}" ]; then
881-
get_dbpass
882-
else
883-
r_dbpass="${6}"
884-
fi
864+
r_dbpass="${6}"
885865
else
886866
get_dbpass
887867
fi
888868
print_debug "Database Pass '${r_dbpass}'"
889869

890870
## Question Database Port
891871
if [ -n "${7}" ]; then
892-
if [ ! -f "${7}" ]; then
893-
get_dbport
894-
else
895-
r_dbport="${7}"
896-
fi
872+
r_dbport="${7}"
897873
else
898874
get_dbport
899875
fi

0 commit comments

Comments
 (0)