From 50f0b3788d2f1ca3bdac4939eb92216a3a666c1d Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Tue, 23 Oct 2018 22:16:59 -0700
Subject: [PATCH] Eliminate redundant checks of cifs_version.

---
 windows_archive/configure-archive.sh          |  2 --
 windows_archive/setup-teslausb                | 22 +++++++++----------
 .../verify-archive-configuration.sh           |  2 --
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/windows_archive/configure-archive.sh b/windows_archive/configure-archive.sh
index e49b897..96638f7 100644
--- a/windows_archive/configure-archive.sh
+++ b/windows_archive/configure-archive.sh
@@ -1,7 +1,5 @@
 #!/bin/bash -eu
 
-cifs_version="${cifs_version:-3}"
-
 function configure_archive () {
   local archive_server_ip_address="$1"
 
diff --git a/windows_archive/setup-teslausb b/windows_archive/setup-teslausb
index 1a00641..b6300ce 100644
--- a/windows_archive/setup-teslausb
+++ b/windows_archive/setup-teslausb
@@ -178,22 +178,20 @@ function make_root_fs_readonly () {
 
 echo "Verifying environment variables..."
 
-if [ ! -n "${cifs_version+x}" ]
-then
-  cifs_version=3
-fi
-
 if [ $RSYNC_ENABLE = true ]
 then
-    check_variable "RSYNC_USER"
-    check_variable "RSYNC_SERVER"
-    export archiveserver=$RSYNC_SERVER
-    check_variable "RSYNC_PATH"
+  check_variable "RSYNC_USER"
+  check_variable "RSYNC_SERVER"
+  export archiveserver=$RSYNC_SERVER
+  check_variable "RSYNC_PATH"
 else # Else for now, TODO allow both for more redundancy?
-    check_variable "sharename"
-    check_variable "shareuser"
-    check_variable "sharepassword"
+  check_variable "sharename"
+  check_variable "shareuser"
+  check_variable "sharepassword"
+  
+  export cifs_version="${cifs_version:-3}"
 fi
+
 check_variable "archiveserver"
 check_variable "campercent"
 
diff --git a/windows_archive/verify-archive-configuration.sh b/windows_archive/verify-archive-configuration.sh
index 8724361..b64d9f0 100644
--- a/windows_archive/verify-archive-configuration.sh
+++ b/windows_archive/verify-archive-configuration.sh
@@ -1,7 +1,5 @@
 #!/bin/bash -eu
 
-cifs_version="${cifs_version:-3}"
-
 function check_archive_server_reachable () {
   echo "Verifying that the archive server $archiveserver is reachable..."
   local serverunreachable=false