Skip to content
This repository was archived by the owner on Jan 17, 2021. It is now read-only.

Commit 4e0edf6

Browse files
committed
fixup! Add flag to sync extensions back to local
1 parent 72991af commit 4e0edf6

File tree

1 file changed

+18
-28
lines changed

1 file changed

+18
-28
lines changed

main.go

+18-28
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"path/filepath"
1414
"runtime"
1515
"strconv"
16-
"sync"
1716
"time"
1817

1918
"github.com/pkg/browser"
@@ -29,7 +28,7 @@ func main() {
2928
var (
3029
skipSyncFlag = flag.Bool("skipsync", false, "skip syncing local settings and extensions to remote host")
3130
sshFlags = flag.String("ssh-flags", "", "custom SSH flags")
32-
syncBack = flag.Bool("b", false, "sync extensions back on SIGINT")
31+
syncBack = flag.Bool("b", false, "sync extensions back on termination")
3332
)
3433

3534
flag.Usage = func() {
@@ -151,36 +150,27 @@ chmod +x `+codeServerPath+`
151150
c := make(chan os.Signal)
152151
signal.Notify(c, os.Interrupt)
153152

154-
var shutdownWg sync.WaitGroup
155-
156-
shutdownWg.Add(1)
157-
go func() {
158-
defer shutdownWg.Done()
159-
160-
select {
161-
case <-ctx.Done():
162-
case <-c:
163-
}
164-
165-
if !*syncBack {
166-
flog.Info("shutting down")
167-
return
168-
}
153+
select {
154+
case <-ctx.Done():
155+
case <-c:
156+
}
169157

170-
flog.Info("synchronizing VS Code back to local")
158+
if !*syncBack {
159+
flog.Info("shutting down")
160+
return
161+
}
171162

172-
err = syncExtensions(host, true)
173-
if err != nil {
174-
flog.Fatal("failed to sync extensions back: %v", err)
175-
}
163+
flog.Info("synchronizing VS Code back to local")
176164

177-
err = syncUserSettings(host, true)
178-
if err != nil {
179-
flog.Fatal("failed to user settigns extensions back: %v", err)
180-
}
181-
}()
165+
err = syncExtensions(host, true)
166+
if err != nil {
167+
flog.Fatal("failed to sync extensions back: %v", err)
168+
}
182169

183-
shutdownWg.Wait()
170+
err = syncUserSettings(host, true)
171+
if err != nil {
172+
flog.Fatal("failed to user settigns extensions back: %v", err)
173+
}
184174
}
185175

186176
func openBrowser(url string) {

0 commit comments

Comments
 (0)