From 8dc3b4ea699ffca052e30c175c0be55384461631 Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Tue, 23 Oct 2018 20:57:58 -0700
Subject: [PATCH] Abstract archive-clips.sh

---
 rsync_archive/{archive-rsync.sh => archive-clips.sh}  | 0
 windows_archive/{archive-cifs.sh => archive-clips.sh} | 0
 windows_archive/archive-teslacam-clips                | 7 +------
 windows_archive/setup-teslausb                        | 8 ++++----
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename rsync_archive/{archive-rsync.sh => archive-clips.sh} (100%)
 rename windows_archive/{archive-cifs.sh => archive-clips.sh} (100%)

diff --git a/rsync_archive/archive-rsync.sh b/rsync_archive/archive-clips.sh
similarity index 100%
rename from rsync_archive/archive-rsync.sh
rename to rsync_archive/archive-clips.sh
diff --git a/windows_archive/archive-cifs.sh b/windows_archive/archive-clips.sh
similarity index 100%
rename from windows_archive/archive-cifs.sh
rename to windows_archive/archive-clips.sh
diff --git a/windows_archive/archive-teslacam-clips b/windows_archive/archive-teslacam-clips
index e2b1322..99b31fd 100644
--- a/windows_archive/archive-teslacam-clips
+++ b/windows_archive/archive-teslacam-clips
@@ -31,12 +31,7 @@ ensure_cam_file_is_mounted
 
 fix_errors_in_cam_file
 
-if [ -r "/root/.teslaCamRsyncConfig" ]
-then
-    /root/bin/archive-rsync.sh
-else
-    /root/bin/archive-cifs.sh
-fi
+/root/bin/archive-clips.sh
 
 if [ -r "/root/.teslaCamRsyncConfig" ]
 then
diff --git a/windows_archive/setup-teslausb b/windows_archive/setup-teslausb
index a5194ef..87e3d0c 100644
--- a/windows_archive/setup-teslausb
+++ b/windows_archive/setup-teslausb
@@ -185,8 +185,8 @@ function configure_archive_scripts () {
 
   if [ $RSYNC_ENABLE = true ]
   then
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/archive-rsync.sh
-    chmod +x archive-rsync.sh
+    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
@@ -194,8 +194,8 @@ function configure_archive_scripts () {
     wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/rsync_archive/disconnect-archive-rsync.sh
     chmod +x disconnect-archive-rsync.sh
   else
-    wget https://raw.githubusercontent.com/"$REPO"/teslausb/"$BRANCH"/windows_archive/archive-cifs.sh
-    chmod +x archive-cifs.sh
+    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