feat: correctly use the xdg library, which has the side effect to fix the config survey (#2195)

cmd/root.go

@@ -107,24 +107,22 @@ func Execute(ctx context.Context, version string) {
 	}
 }
 
-// Return locations where Act's config can be found in order : XDG spec, .actrc in HOME directory, .actrc in invocation directory
+// Return locations where Act's config can be found in order: XDG spec, .actrc in HOME directory, .actrc in invocation directory
 func configLocations() []string {
 	configFileName := ".actrc"
 
-	// reference: https://specifications.freedesktop.org/basedir-spec/latest/ar01s03.html
+	homePath := filepath.Join(UserHomeDir, configFileName)
-	var actrcXdg string
+	invocationPath := filepath.Join(".", configFileName)
-	for _, fileName := range []string{"act/actrc", configFileName} {
+
-		if foundConfig, err := xdg.SearchConfigFile(fileName); foundConfig != "" && err == nil {
+	// Though named xdg, adrg's lib support macOS and Windows config paths as well
-			actrcXdg = foundConfig
+	// It also takes cares of creating the parent folder so we don't need to bother later
-			break
+	specPath, err := xdg.ConfigFile("act/actrc")
-		}
+	if err != nil {
+		specPath = homePath
 	}
 
-	return []string{
+	// This order should be enforced since the survey part relies on it
-		actrcXdg,
+	return []string{specPath, homePath, invocationPath}
-		filepath.Join(UserHomeDir, configFileName),
-		filepath.Join(".", configFileName),
-	}
 }
 
 var commonSocketPaths = []string{
@@ -554,7 +552,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
 				}
 			}
 			if !cfgFound && len(cfgLocations) > 0 {
-				// The first config location refers to the XDG spec one
+				// The first config location refers to the global config folder one
 				if err := defaultImageSurvey(cfgLocations[0]); err != nil {
 					log.Fatal(err)
 				}