File tree Expand file tree Collapse file tree 2 files changed +12
-30
lines changed Expand file tree Collapse file tree 2 files changed +12
-30
lines changed Original file line number Diff line number Diff line change
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
+
1
7
## 3.3.6 2022-06-23 <dave at tiredofit dot ca >
2
8
3
9
### Changed
Original file line number Diff line number Diff line change @@ -829,71 +829,47 @@ print_debug "Filename to recover '${r_filename}'"
829
829
830
830
## Question Database Type
831
831
if [ -n "${2}" ]; then
832
- if [ ! -f "${2}" ]; then
833
- get_dbtype
834
- else
835
- r_dbtype="${2}"
836
- fi
832
+ r_dbtype="${2}"
837
833
else
838
834
get_dbtype
839
835
fi
840
836
print_debug "Database type '${r_dbtype}'"
841
837
842
838
## Question Database Host
843
839
if [ -n "${3}" ]; then
844
- if [ ! -f "${3}" ]; then
845
- get_dbhost
846
- else
847
- r_dbhost="${3}"
848
- fi
840
+ r_dbhost="${3}"
849
841
else
850
842
get_dbhost
851
843
fi
852
844
print_debug "Database Host '${r_dbhost}'"
853
845
854
846
## Question Database Name
855
847
if [ -n "${4}" ]; then
856
- if [ ! -f "${4}" ]; then
857
- get_dbname
858
- else
859
- r_dbname="${4}"
860
- fi
848
+ r_dbname="${4}"
861
849
else
862
850
get_dbname
863
851
fi
864
852
print_debug "Database Name '${r_dbname}'"
865
853
866
854
## Question Database User
867
855
if [ -n "${5}" ]; then
868
- if [ ! -f "${5}" ]; then
869
- get_dbuser
870
- else
871
- r_dbuser="${5}"
872
- fi
856
+ r_dbuser="${5}"
873
857
else
874
858
get_dbuser
875
859
fi
876
860
print_debug "Database User '${r_dbuser}'"
877
861
878
862
## Question Database Password
879
863
if [ -n "${6}" ]; then
880
- if [ ! -f "${6}" ]; then
881
- get_dbpass
882
- else
883
- r_dbpass="${6}"
884
- fi
864
+ r_dbpass="${6}"
885
865
else
886
866
get_dbpass
887
867
fi
888
868
print_debug "Database Pass '${r_dbpass}'"
889
869
890
870
## Question Database Port
891
871
if [ -n "${7}" ]; then
892
- if [ ! -f "${7}" ]; then
893
- get_dbport
894
- else
895
- r_dbport="${7}"
896
- fi
872
+ r_dbport="${7}"
897
873
else
898
874
get_dbport
899
875
fi
You can’t perform that action at this time.
0 commit comments