Diff
1diff --git a/.gitignore b/.gitignore
2index 1279456b490763e6acb7b709fbd3bf54017e1a90..cceafdf5269fe20087e54962ac504d48e51af84e 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,4 +1,4 @@
6-soft
7+cmd/soft/soft
8 .ssh
9 .repos
10 dist
11diff --git a/.goreleaser.yml b/.goreleaser.yml
12index 2b870785d828d3bb6c85e392d9ac16b9b4679745..012af0384b4165f539e9bde5c9a05640a7e31809 100644
13--- a/.goreleaser.yml
14+++ b/.goreleaser.yml
15@@ -10,6 +10,7 @@ before:
16
17 builds:
18 - binary: "soft"
19+ main: "./cmd/soft"
20 ldflags: -s -w -X main.Version=v{{ .Version }} -X main.CommitSHA={{ .Commit }}
21 goos:
22 - linux
23diff --git a/README.md b/README.md
24index 68b6bfe69402c6b4e482c3fdf78e81158dc1702b..cd6dc0fbc25a2fa8f478bea72934e9dcfe4767cd 100644
25--- a/README.md
26+++ b/README.md
27@@ -49,7 +49,7 @@ Or just build and install it with `go`:
28
29 ```bash
30 git clone ssh://git.charm.sh/soft-serve
31-cd soft-serve
32+cd soft-serve/cmd/soft
33 go install
34 ```
35
36diff --git a/main.go b/cmd/soft/main.go
37rename from main.go
38rename to cmd/soft/main.go
39index 827b41f058faaa4b4e03428060c258804565c410..a25e5618add65e0ce2e04d9b64719dbfa2933a63 100644
40--- a/main.go
41+++ b/cmd/soft/main.go
42@@ -6,8 +6,8 @@ import (
43 "log"
44 "os"
45
46- "github.com/charmbracelet/soft/config"
47- "github.com/charmbracelet/soft/server"
48+ "github.com/charmbracelet/soft-serve/config"
49+ "github.com/charmbracelet/soft-serve/server"
50 )
51
52 var (
53diff --git a/go.mod b/go.mod
54index 04505f836df19c89dc3923e43c2e2cd428121f8a..5e897507b247113f2195903c0015a145989da140 100644
55--- a/go.mod
56+++ b/go.mod
57@@ -1,10 +1,10 @@
58-module github.com/charmbracelet/soft
59+module github.com/charmbracelet/soft-serve
60
61 go 1.17
62
63 require (
64 github.com/charmbracelet/bubbles v0.9.0
65- github.com/charmbracelet/bubbletea v0.19.0
66+ github.com/charmbracelet/bubbletea v0.19.1
67 github.com/charmbracelet/glamour v0.3.0
68 github.com/charmbracelet/lipgloss v0.4.0
69 github.com/charmbracelet/wish v0.1.1
70diff --git a/go.sum b/go.sum
71index 9e5f393475e230c94ea98a741fe455ef5dd1e89f..b9c8cbac5d8878bb7999a61f7fc0c3a24200e393 100644
72--- a/go.sum
73+++ b/go.sum
74@@ -25,8 +25,9 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3
75 github.com/charmbracelet/bubbles v0.9.0 h1:lqJ8FXwoLceQF2J0A+dWo1Cuu1dNyjbW4Opgdi2vkhw=
76 github.com/charmbracelet/bubbles v0.9.0/go.mod h1:NWT/c+0rYEnYChz5qCyX4Lj6fDw9gGToh9EFJPajghU=
77 github.com/charmbracelet/bubbletea v0.14.1/go.mod h1:b5lOf5mLjMg1tRn1HVla54guZB+jvsyV0yYAQja95zE=
78-github.com/charmbracelet/bubbletea v0.19.0 h1:1gz4rbxl3qZik/oP8QW2vUtul2gO8RDDzmoLGERpTQc=
79 github.com/charmbracelet/bubbletea v0.19.0/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
80+github.com/charmbracelet/bubbletea v0.19.1 h1:VHuzkJbnTAkxhOfi9+Lb5PYfNM9+Oh+qhP8uDX5ReOU=
81+github.com/charmbracelet/bubbletea v0.19.1/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
82 github.com/charmbracelet/glamour v0.3.0 h1:3H+ZrKlSg8s+WU6V7eF2eRVYt8lCueffbi7r2+ffGkc=
83 github.com/charmbracelet/glamour v0.3.0/go.mod h1:TzF0koPZhqq0YVBNL100cPHznAAjVj7fksX2RInwjGw=
84 github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
85diff --git a/internal/config/config.go b/internal/config/config.go
86index d1269a19fa97752c358bbf783bc180db9da0486d..21a22b33d4589a24eaf3dc2c1d1fc04e385e8ab4 100644
87--- a/internal/config/config.go
88+++ b/internal/config/config.go
89@@ -10,8 +10,8 @@ import (
90 "fmt"
91 "os"
92
93- "github.com/charmbracelet/soft/config"
94- "github.com/charmbracelet/soft/internal/git"
95+ "github.com/charmbracelet/soft-serve/config"
96+ "github.com/charmbracelet/soft-serve/internal/git"
97 gg "github.com/go-git/go-git/v5"
98 "github.com/go-git/go-git/v5/plumbing/object"
99 )
100diff --git a/internal/tui/bubble.go b/internal/tui/bubble.go
101index 6406fc82d2493f11ee462daf73a332133ed0d496..c5071c4b836ed6e54388cb6238e42d29cab6a7ad 100644
102--- a/internal/tui/bubble.go
103+++ b/internal/tui/bubble.go
104@@ -6,10 +6,10 @@ import (
105
106 tea "github.com/charmbracelet/bubbletea"
107 "github.com/charmbracelet/lipgloss"
108- "github.com/charmbracelet/soft/internal/config"
109- "github.com/charmbracelet/soft/internal/tui/bubbles/repo"
110- "github.com/charmbracelet/soft/internal/tui/bubbles/selection"
111- "github.com/charmbracelet/soft/internal/tui/style"
112+ "github.com/charmbracelet/soft-serve/internal/config"
113+ "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
114+ "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
115+ "github.com/charmbracelet/soft-serve/internal/tui/style"
116 "github.com/gliderlabs/ssh"
117 )
118
119diff --git a/internal/tui/bubbles/commits/bubble.go b/internal/tui/bubbles/commits/bubble.go
120index 205daa701d116d77ea01a7bc98e0866f27c3f6dc..4edc6a6c21e6a0a59c90695dfc6b1dc76e7aea2c 100644
121--- a/internal/tui/bubbles/commits/bubble.go
122+++ b/internal/tui/bubbles/commits/bubble.go
123@@ -5,7 +5,7 @@ import (
124
125 "github.com/charmbracelet/bubbles/viewport"
126 tea "github.com/charmbracelet/bubbletea"
127- "github.com/charmbracelet/soft/internal/git"
128+ "github.com/charmbracelet/soft-serve/internal/git"
129 "github.com/dustin/go-humanize"
130 )
131
132diff --git a/internal/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go
133index d3daec982b535f095a87fa688a3991fbf8b9ae6e..63bf8853655a475e8458fa93a69032aaa575da77 100644
134--- a/internal/tui/bubbles/repo/bubble.go
135+++ b/internal/tui/bubbles/repo/bubble.go
136@@ -10,8 +10,8 @@ import (
137 tea "github.com/charmbracelet/bubbletea"
138 "github.com/charmbracelet/glamour"
139 "github.com/charmbracelet/lipgloss"
140- "github.com/charmbracelet/soft/internal/git"
141- "github.com/charmbracelet/soft/internal/tui/style"
142+ "github.com/charmbracelet/soft-serve/internal/git"
143+ "github.com/charmbracelet/soft-serve/internal/tui/style"
144 "github.com/muesli/reflow/truncate"
145 "github.com/muesli/reflow/wrap"
146 )
147diff --git a/internal/tui/bubbles/selection/bubble.go b/internal/tui/bubbles/selection/bubble.go
148index 824a65d71078fdb417ddd947f55d2b9c8bb72ce2..6a8a59342651ac3ebfc0056a9328b17a0b75beb0 100644
149--- a/internal/tui/bubbles/selection/bubble.go
150+++ b/internal/tui/bubbles/selection/bubble.go
151@@ -5,7 +5,7 @@ import (
152
153 tea "github.com/charmbracelet/bubbletea"
154 "github.com/charmbracelet/lipgloss"
155- "github.com/charmbracelet/soft/internal/tui/style"
156+ "github.com/charmbracelet/soft-serve/internal/tui/style"
157 "github.com/muesli/reflow/truncate"
158 )
159
160diff --git a/internal/tui/commands.go b/internal/tui/commands.go
161index 6ace2cf37ace9d5e120ddd2fc5a64dc6e1478320..6b98ca7d6d32279c8c27ab7e0826c1d3dde70e2a 100644
162--- a/internal/tui/commands.go
163+++ b/internal/tui/commands.go
164@@ -5,9 +5,9 @@ import (
165
166 tea "github.com/charmbracelet/bubbletea"
167 "github.com/charmbracelet/lipgloss"
168- "github.com/charmbracelet/soft/internal/config"
169- br "github.com/charmbracelet/soft/internal/tui/bubbles/repo"
170- "github.com/charmbracelet/soft/internal/tui/bubbles/selection"
171+ "github.com/charmbracelet/soft-serve/internal/config"
172+ br "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
173+ "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
174 gm "github.com/charmbracelet/wish/git"
175 )
176
177diff --git a/internal/tui/session.go b/internal/tui/session.go
178index 9f2c48600f8c4699380c5938ea327ef95e6418d7..aa1573fd3ecf42f860e1a3afbd53a54005c5d078 100644
179--- a/internal/tui/session.go
180+++ b/internal/tui/session.go
181@@ -4,7 +4,7 @@ import (
182 "fmt"
183
184 tea "github.com/charmbracelet/bubbletea"
185- "github.com/charmbracelet/soft/internal/config"
186+ "github.com/charmbracelet/soft-serve/internal/config"
187 "github.com/gliderlabs/ssh"
188 )
189
190diff --git a/server/server.go b/server/server.go
191index 59ed0488d4769ca2b13c407a300b47192b21c572..684a6048fa280d3b40abd674bddfbfa65d870634 100644
192--- a/server/server.go
193+++ b/server/server.go
194@@ -4,9 +4,9 @@ import (
195 "fmt"
196 "log"
197
198- "github.com/charmbracelet/soft/config"
199- appCfg "github.com/charmbracelet/soft/internal/config"
200- "github.com/charmbracelet/soft/internal/tui"
201+ "github.com/charmbracelet/soft-serve/config"
202+ appCfg "github.com/charmbracelet/soft-serve/internal/config"
203+ "github.com/charmbracelet/soft-serve/internal/tui"
204
205 "github.com/charmbracelet/wish"
206 bm "github.com/charmbracelet/wish/bubbletea"