carsten/teslausb
1
0
Fork 0
mirror of https://github.com/cimryan/teslausb.git synced 2026-03-01 04:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate redundant checks of cifs_version.

Browse Source
This commit is contained in:
cimryan
2018-10-23 22:16:59 -07:00
parent d1cd47cbda
commit 50f0b3788d
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
windows_archive/configure-archive.sh
View File

@@ -1,7 +1,5 @@
#!/bin/bash -eu #!/bin/bash -eu
cifs_version="${cifs_version:-3}"
function configure_archive () { function configure_archive () {
local archive_server_ip_address="$1" local archive_server_ip_address="$1"

22
windows_archive/setup-teslausb
View File

@@ -178,22 +178,20 @@ function make_root_fs_readonly () {
echo "Verifying environment variables..." echo "Verifying environment variables..."
if [ ! -n "${cifs_version+x}" ]
then
cifs_version=3
fi
if [ $RSYNC_ENABLE = true ] if [ $RSYNC_ENABLE = true ]
then then
check_variable "RSYNC_USER" check_variable "RSYNC_USER"
check_variable "RSYNC_SERVER" check_variable "RSYNC_SERVER"
export archiveserver=$RSYNC_SERVER export archiveserver=$RSYNC_SERVER
check_variable "RSYNC_PATH" check_variable "RSYNC_PATH"
else # Else for now, TODO allow both for more redundancy? else # Else for now, TODO allow both for more redundancy?
check_variable "sharename" check_variable "sharename"
check_variable "shareuser" check_variable "shareuser"
check_variable "sharepassword" check_variable "sharepassword"
export cifs_version="${cifs_version:-3}"
fi fi
check_variable "archiveserver" check_variable "archiveserver"
check_variable "campercent" check_variable "campercent"

2
windows_archive/verify-archive-configuration.sh
View File

@@ -1,7 +1,5 @@
#!/bin/bash -eu #!/bin/bash -eu
cifs_version="${cifs_version:-3}"
function check_archive_server_reachable () { function check_archive_server_reachable () {
echo "Verifying that the archive server $archiveserver is reachable..." echo "Verifying that the archive server $archiveserver is reachable..."
local serverunreachable=false local serverunreachable=false