Foxed conflicts in main

Author: matteosuppo

main.go

@@ -14,11 +14,8 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-<<<<<<< e73846650fde9b0955aa35e237100ec552af47fb
-=======
 	"github.com/arduino/arduino-create-agent/tools"
-	"github.com/carlescere/scheduler"
->>>>>>> Move initialization of tools in package tools
+	"github.com/arduino/arduino-create-agent/utilities"
 	"github.com/gin-gonic/gin"
 	"github.com/itsjamie/gin-cors"
 	"github.com/kardianos/osext"
@@ -105,7 +102,7 @@ func main() {
 				// save the config.ini (if it exists)
 				if _, err := os.Stat(dest + "/" + *configIni); os.IsNotExist(err) {
 					log.Println("First run, unzipping self")
-					err := Unzip(src, dest)
+					err := utilities.Unzip(src, dest)
 					log.Println("Self extraction, err:", err)
 				}
 

utilities/utilities.go

@@ -1,12 +1,14 @@
 package utilities
 
 import (
+	"archive/zip"
 	"bytes"
 	"errors"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 )
 
@@ -87,3 +89,40 @@ func call(stack []*exec.Cmd, pipes []*io.PipeWriter) (err error) {
 	}
 	return stack[0].Wait()
 }
+
+func Unzip(zippath string, destination string) (err error) {
+	r, err := zip.OpenReader(zippath)
+	if err != nil {
+		return err
+	}
+	for _, f := range r.File {
+		fullname := path.Join(destination, f.Name)
+		if f.FileInfo().IsDir() {
+			os.MkdirAll(fullname, f.FileInfo().Mode().Perm())
+		} else {
+			os.MkdirAll(filepath.Dir(fullname), 0755)
+			perms := f.FileInfo().Mode().Perm()
+			out, err := os.OpenFile(fullname, os.O_CREATE|os.O_RDWR, perms)
+			if err != nil {
+				return err
+			}
+			rc, err := f.Open()
+			if err != nil {
+				return err
+			}
+			_, err = io.CopyN(out, rc, f.FileInfo().Size())
+			if err != nil {
+				return err
+			}
+			rc.Close()
+			out.Close()
+
+			mtime := f.FileInfo().ModTime()
+			err = os.Chtimes(fullname, mtime, mtime)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return
+}