From 0d5836b4e86f0f35c5048d5cd4b12d3b775b291c Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Sat, 30 Jun 2018 07:42:30 -0700
Subject: [PATCH] fix zipping

---
 src/files.go    | 10 +---------
 src/zip.go      |  8 ++++----
 src/zip_test.go |  5 ++---
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/files.go b/src/files.go
index 80a3c827..2ed68ae3 100644
--- a/src/files.go
+++ b/src/files.go
@@ -97,15 +97,7 @@ func (c *Croc) getFilesReady() (err error) {
 		return
 	}
 	// encrypt file data
-	// create temporary filename
-	var f *os.File
-	f, err = ioutil.TempFile(".", "croc-encrypted")
-	if err != nil {
-		return
-	}
-	c.crocFileEncrypted = f.Name()
-	f.Close()
-	os.Remove(c.crocFileEncrypted)
+	c.crocFileEncrypted = tempFileName("croc-encrypted")
 	err = encryptFile(c.crocFile, c.crocFileEncrypted, passphrase)
 	if err != nil {
 		return
diff --git a/src/zip.go b/src/zip.go
index e3a5c332..ce7491ed 100644
--- a/src/zip.go
+++ b/src/zip.go
@@ -78,10 +78,7 @@ func zipFile(fname string, compress bool) (writtenFilename string, err error) {
 		log.Error(err)
 		return
 	}
-	defer os.Chdir(curdir)
-	os.Chdir(pathtofile)
-
-	newfile, err := ioutil.TempFile(".", "croc-unencrypted")
+	newfile, err := ioutil.TempFile(".", "croc-zipped")
 	if err != nil {
 		log.Error(err)
 		return
@@ -89,6 +86,9 @@ func zipFile(fname string, compress bool) (writtenFilename string, err error) {
 	writtenFilename = newfile.Name()
 	defer newfile.Close()
 
+	defer os.Chdir(curdir)
+	os.Chdir(pathtofile)
+
 	zipWriter := zip.NewWriter(newfile)
 	zipWriter.RegisterCompressor(zip.Deflate, func(out io.Writer) (io.WriteCloser, error) {
 		if compress {
diff --git a/src/zip_test.go b/src/zip_test.go
index ebb294b7..3ea8f264 100644
--- a/src/zip_test.go
+++ b/src/zip_test.go
@@ -1,7 +1,6 @@
 package croc
 
 import (
-	"os"
 	"testing"
 
 	log "github.com/cihub/seelog"
@@ -12,10 +11,10 @@ func TestZip(t *testing.T) {
 	defer log.Flush()
 	writtenFilename, err := zipFile("../testing_data", false)
 	assert.Nil(t, err)
-	defer os.Remove(writtenFilename)
+	// defer os.Remove(writtenFilename)
 
 	err = unzipFile(writtenFilename, ".")
 	assert.Nil(t, err)
 	assert.True(t, exists("testing_data"))
-	os.RemoveAll("testing_data")
+	// os.RemoveAll("testing_data")
 }