From 4c4e5ad93b24d9a2ef1bb3c18ed3aaff2eaa94c9 Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Tue, 23 Oct 2018 21:01:02 -0700
Subject: [PATCH] Abstract connect-archive.sh and disconnect-archive.sh

---
 ...nnect-archive-rsync.sh => connect-archive.sh} |  0
 ...ct-archive-rsync.sh => disconnect-archive.sh} |  0
 windows_archive/archive-teslacam-clips           | 14 ++------------
 ...onnect-archive-cifs.sh => connect-archive.sh} |  0
 ...ect-archive-cifs.sh => disconnect-archive.sh} |  0
 windows_archive/setup-teslausb                   | 16 ++++++++--------
 6 files changed, 10 insertions(+), 20 deletions(-)
 rename rsync_archive/{connect-archive-rsync.sh => connect-archive.sh} (100%)
 rename rsync_archive/{disconnect-archive-rsync.sh => disconnect-archive.sh} (100%)
 rename windows_archive/{connect-archive-cifs.sh => connect-archive.sh} (100%)
 rename windows_archive/{disconnect-archive-cifs.sh => disconnect-archive.sh} (100%)

diff --git a/rsync_archive/connect-archive-rsync.sh b/rsync_archive/connect-archive.sh
similarity index 100%
rename from rsync_archive/connect-archive-rsync.sh
rename to rsync_archive/connect-archive.sh
diff --git a/rsync_archive/disconnect-archive-rsync.sh b/rsync_archive/disconnect-archive.sh
similarity index 100%
rename from rsync_archive/disconnect-archive-rsync.sh
rename to rsync_archive/disconnect-archive.sh
diff --git a/windows_archive/archive-teslacam-clips b/windows_archive/archive-teslacam-clips
index 99b31fd..a29be15 100644
--- a/windows_archive/archive-teslacam-clips
+++ b/windows_archive/archive-teslacam-clips
@@ -18,12 +18,7 @@ export -f log
 
 log "Starting..."
 
-if [ -r "/root/.teslaCamRsyncConfig" ]
-then
-  /root/bin/connect-archive-rsync.sh
-else
-  /root/bin/connect-archive-cifs.sh
-fi
+/root/bin/connect-archive.sh
 
 disconnect_usb_drives_from_host
 
@@ -33,12 +28,7 @@ fix_errors_in_cam_file
 
 /root/bin/archive-clips.sh
 
-if [ -r "/root/.teslaCamRsyncConfig" ]
-then
-    /root/bin/disconnect-archive-rsync.sh
-else
-    /root/bin/disconnect-archive-cifs.sh
-fi
+/root/bin/disconnect-archive.sh
 
 unmount_cam_file
 
diff --git a/windows_archive/connect-archive-cifs.sh b/windows_archive/connect-archive.sh
similarity index 100%
rename from windows_archive/connect-archive-cifs.sh
rename to windows_archive/connect-archive.sh
diff --git a/windows_archive/disconnect-archive-cifs.sh b/windows_archive/disconnect-archive.sh
similarity index 100%
rename from windows_archive/disconnect-archive-cifs.sh
rename to windows_archive/disconnect-archive.sh
diff --git a/windows_archive/setup-teslausb b/windows_archive/setup-teslausb
index 87e3d0c..3a7f533 100644
--- a/windows_archive/setup-teslausb
+++ b/windows_archive/setup-teslausb
@@ -188,20 +188,20 @@ function configure_archive_scripts () {
     wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/archive-clips.sh
     chmod +x archive-clips.sh
     
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/connect-archive-rsync.sh
-    chmod +x connect-archive-rsync.sh
+    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/connect-archive.sh
+    chmod +x connect-archive.sh
 
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/disconnect-archive-rsync.sh
-    chmod +x disconnect-archive-rsync.sh
+    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/disconnect-archive.sh
+    chmod +x disconnect-archive.sh
   else
     wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/archive-clips.sh
     chmod +x archive-clips.sh
     
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/connect-archive-cifs.sh
-    chmod +x connect-archive-cifs.sh
+    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/connect-archive.sh
+    chmod +x connect-archive.sh
 
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/disconnect-archive-cifs.sh
-    chmod +x disconnect-archive-cifs.sh
+    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/disconnect-archive.sh
+    chmod +x disconnect-archive.sh
   fi 
   popd
   echo "Configured the archive scripts."