From d50c8f271ffc027b639106c06a17d1f107850b76 Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Tue, 9 Oct 2018 17:11:54 -0700
Subject: [PATCH] remove created zip directory after finish

---
 src/sender/sender.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/sender/sender.go b/src/sender/sender.go
index f386c413..08f09b5d 100644
--- a/src/sender/sender.go
+++ b/src/sender/sender.go
@@ -150,8 +150,11 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
 				if fstats.IsDir {
 					// zip the directory
 					fstats.SentName, err = zipper.ZipFile(fname, true)
-					// remove the file when leaving
-					defer os.Remove(fstats.SentName)
+					if err != nil {
+						log.Error(err)
+						fileReady <- err
+						return
+					}
 					fname = fstats.SentName
 
 					fstat, err := os.Stat(fname)
@@ -235,6 +238,10 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
 			log.Debugf("found blocks: %+v", blocksToSkip)
 
 			// start streaming encryption/compression
+			if fstats.IsDir {
+				// remove file if zipped
+				defer os.Remove(fstats.SentName)
+			}
 			go func(dataChan chan DataChan) {
 				var buffer []byte
 				if useWebsockets {
@@ -242,6 +249,7 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
 				} else {
 					buffer = make([]byte, models.TCP_BUFFER_SIZE/2)
 				}
+
 				currentPostition := int64(0)
 				for {
 					bytesread, err := f.Read(buffer)