@@ -97,17 +97,17 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
9797 ghAwRepositories := buildRepositoryPermissions (repoName , owner , additionalRepos )
9898
9999 var config DevcontainerConfig
100-
100+
101101 if existingConfig != nil {
102102 // Update existing configuration
103103 devcontainerLog .Printf ("Updating existing devcontainer.json" )
104104 config = * existingConfig
105-
105+
106106 // Ensure customizations exists
107107 if config .Customizations == nil {
108108 config .Customizations = & DevcontainerCustomizations {}
109109 }
110-
110+
111111 // Merge VSCode extensions
112112 if config .Customizations .VSCode == nil {
113113 config .Customizations .VSCode = & DevcontainerVSCode {}
@@ -116,7 +116,7 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
116116 config .Customizations .VSCode .Extensions ,
117117 []string {"GitHub.copilot" , "GitHub.copilot-chat" },
118118 )
119-
119+
120120 // Merge Codespaces repositories
121121 if config .Customizations .Codespaces == nil {
122122 config .Customizations .Codespaces = & DevcontainerCodespaces {
@@ -130,7 +130,7 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
130130 config .Customizations .Codespaces .Repositories [repo ] = perms
131131 devcontainerLog .Printf ("Updated permissions for repo: %s" , repo )
132132 }
133-
133+
134134 // Merge features
135135 if config .Features == nil {
136136 config .Features = make (DevcontainerFeatures )
@@ -139,7 +139,7 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
139139 "ghcr.io/devcontainers/features/github-cli:1" : map [string ]any {},
140140 "ghcr.io/devcontainers/features/copilot-cli:latest" : map [string ]any {},
141141 })
142-
142+
143143 // Update postCreateCommand if not set or if it doesn't include gh-aw install
144144 if config .PostCreateCommand == "" || ! strings .Contains (config .PostCreateCommand , "install-gh-aw.sh" ) {
145145 ghAwInstall := "curl -fsSL https://raw.githubusercontent.com/githubnext/gh-aw/refs/heads/main/install-gh-aw.sh | bash"
@@ -150,7 +150,7 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
150150 }
151151 devcontainerLog .Printf ("Updated postCreateCommand to include gh-aw installation" )
152152 }
153-
153+
154154 if verbose {
155155 fmt .Fprintf (os .Stderr , "Updated existing devcontainer at %s\n " , devcontainerPath )
156156 }
@@ -177,7 +177,7 @@ func ensureDevcontainerConfig(verbose bool, additionalRepos []string) error {
177177 },
178178 PostCreateCommand : "curl -fsSL https://raw.githubusercontent.com/githubnext/gh-aw/refs/heads/main/install-gh-aw.sh | bash" ,
179179 }
180-
180+
181181 if verbose {
182182 fmt .Fprintf (os .Stderr , "Created new devcontainer at %s\n " , devcontainerPath )
183183 }
@@ -271,37 +271,37 @@ func buildRepositoryPermissions(repoName, owner string, additionalRepos []string
271271func mergeExtensions (existing , toAdd []string ) []string {
272272 extensionSet := make (map [string ]bool )
273273 result := make ([]string , 0 , len (existing )+ len (toAdd ))
274-
274+
275275 // Add existing extensions
276276 for _ , ext := range existing {
277277 if ! extensionSet [ext ] {
278278 extensionSet [ext ] = true
279279 result = append (result , ext )
280280 }
281281 }
282-
282+
283283 // Add new extensions if not already present
284284 for _ , ext := range toAdd {
285285 if ! extensionSet [ext ] {
286286 extensionSet [ext ] = true
287287 result = append (result , ext )
288288 }
289289 }
290-
290+
291291 return result
292292}
293293
294294// mergeFeatures adds new features to existing features map, updating old copilot-cli versions
295295func mergeFeatures (existing DevcontainerFeatures , toAdd map [string ]any ) {
296296 // First, remove old copilot-cli versions
297297 for key := range existing {
298- if strings .HasPrefix (key , "ghcr.io/devcontainers/features/copilot-cli:" ) &&
299- key != "ghcr.io/devcontainers/features/copilot-cli:latest" {
298+ if strings .HasPrefix (key , "ghcr.io/devcontainers/features/copilot-cli:" ) &&
299+ key != "ghcr.io/devcontainers/features/copilot-cli:latest" {
300300 delete (existing , key )
301301 devcontainerLog .Printf ("Removed old copilot-cli version: %s" , key )
302302 }
303303 }
304-
304+
305305 // Add new features
306306 for key , value := range toAdd {
307307 existing [key ] = value
0 commit comments