Separate LD_LIBRARY_PATH adder for /opt/intel

Author: facchinm

handlers.go

@@ -393,6 +393,7 @@ func checkForLibrariesMissingError(filepath string, sketch *SketchStatus, status
 	if strings.Contains(err, "error while loading shared libraries") {
 		// download dependencies and retry
 		// if the error persists, bail out
+		addIntelLibrariesToLdPath()
 		fmt.Println("Missing library!")
 		library := extractLibrary(err)
 		status.Info("/upload", "Downloading needed libraries")

main.go

@@ -139,18 +139,7 @@ func (p program) run() {
 	// This way any external library can be safely copied there and the sketch should run anyway
 	os.Setenv("LD_LIBRARY_PATH", filepath.Join(sketchFolder, "lib")+":"+os.Getenv("LD_LIBRARY_PATH"))
 
-	_, err = os.Stat("/opt/intel")
-	if err == nil {
-		//scan /opt/intel searching for sdks
-		var extraPaths []string
-		filepath.Walk("/opt/intel", func(path string, f os.FileInfo, err error) error {
-			if strings.Contains(f.Name(), ".so") {
-				extraPaths = appendIfUnique(extraPaths, path)
-			}
-			return nil
-		})
-		os.Setenv("LD_LIBRARY_PATH", strings.Join(extraPaths, ":")+":"+os.Getenv("LD_LIBRARY_PATH"))
-	}
+	addIntelLibrariesToLdPath()
 
 	files, err := ioutil.ReadDir(sketchFolder)
 

utils.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func addIntelLibrariesToLdPath() {
+	_, err := os.Stat("/opt/intel")
+	if err == nil {
+		//scan /opt/intel searching for sdks
+		var extraPaths []string
+		filepath.Walk("/opt/intel", func(path string, f os.FileInfo, err error) error {
+			if strings.Contains(f.Name(), ".so") {
+				extraPaths = appendIfUnique(extraPaths, filepath.Dir(path))
+			}
+			return nil
+		})
+		os.Setenv("LD_LIBRARY_PATH", strings.Join(extraPaths, ":")+":"+os.Getenv("LD_LIBRARY_PATH"))
+	}
+}