Fix symbolic link sync problem & upstream ignore problem

Author: FabianKramm

pkg/devspace/sync/evaluater.go

@@ -49,7 +49,7 @@ func shouldUpload(relativePath string, stat os.FileInfo, s *SyncConfig, isInitia
 
 	// Exclude changes on the upload exclude list
 	// if s.uploadIgnoreMatcher != nil {
-	// 	if s.uploadIgnoreMatcher.MatchesPath(relativePath) {
+	//	if s.uploadIgnoreMatcher.MatchesPath(relativePath) {
 	//		return false
 	//	}
 	// }

pkg/devspace/sync/file_information.go

@@ -56,7 +56,7 @@ func (p parsingError) Error() string {
 }
 
 func getFindCommand(destPath string) string {
-	return "mkdir -p '" + destPath + "' && find '" + destPath + "' -exec stat -c \"%n///%s,%Y,%f,%a,%u,%g\" {} + 2>/dev/null && echo -n \"" + EndAck + "\" || echo \"" + ErrorAck + "\"\n"
+	return "mkdir -p '" + destPath + "' && find -L '" + destPath + "' -exec stat -c \"%n///%s,%Y,%f,%a,%u,%g\" {} + 2>/dev/null && echo -n \"" + EndAck + "\" || echo \"" + ErrorAck + "\"\n"
 }
 
 func parseFileInformation(fileline, destPath string) (*fileInformation, error) {

pkg/devspace/sync/sync_config.go

@@ -293,10 +293,10 @@ func (s *SyncConfig) diffServerClient(filepath string, sendChanges *[]*fileInfor
 
 	delete(downloadChanges, relativePath)
 
-	s.fileIndex.fileMapMutex.Lock()
 	// Exclude changes on the upload exclude list
 	if s.uploadIgnoreMatcher != nil {
 		if s.uploadIgnoreMatcher.MatchesPath(relativePath) {
+			s.fileIndex.fileMapMutex.Lock()
 			// Add to file map and prevent download if local file is newer than the remote one
 			if s.fileIndex.fileMap[relativePath] != nil && s.fileIndex.fileMap[relativePath].Mtime < ceilMtime(stat.ModTime()) {
 				// Add it to the fileMap
@@ -307,11 +307,13 @@ func (s *SyncConfig) diffServerClient(filepath string, sendChanges *[]*fileInfor
 					IsDirectory: stat.IsDir(),
 				}
 			}
+			s.fileIndex.fileMapMutex.Unlock()
 
 			return nil
 		}
 	}
 
+	s.fileIndex.fileMapMutex.Lock()
 	shouldUpload := shouldUpload(relativePath, stat, s, true)
 	s.fileIndex.fileMapMutex.Unlock()
 
@@ -343,7 +345,7 @@ func (s *SyncConfig) diffDir(filepath string, stat os.FileInfo, sendChanges *[]*
 		return nil
 	}
 
-	if len(files) == 0 {
+	if len(files) == 0 && relativePath != "" {
 		*sendChanges = append(*sendChanges, &fileInformation{
 			Name:        relativePath,
 			Mtime:       ceilMtime(stat.ModTime()),