Skip to content

Commit fee0f7e

Browse files
committed
line ending work in local
1 parent 21357e8 commit fee0f7e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

client/client.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (c *client) withRPCClient(f func(*rpc.Client) error) error {
111111
if err != nil {
112112
log.Println(err)
113113
log.Println("Fall back to localhost")
114-
rc, err = fallbackLocal()
114+
rc, err = c.fallbackLocal()
115115
if err != nil {
116116
return err
117117
}
@@ -124,8 +124,9 @@ func (c *client) withRPCClient(f func(*rpc.Client) error) error {
124124
return nil
125125
}
126126

127-
func fallbackLocal() (*rpc.Client, error) {
127+
func (c *client) fallbackLocal() (*rpc.Client, error) {
128128
port, err := server.ServeLocal()
129+
server.LineEndingOpt = c.lineEnding
129130
if err != nil {
130131
return nil, err
131132
}

server/clipboard.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type Clipboard struct{}
99

1010
func (_ *Clipboard) Copy(text string, _ *struct{}) error {
1111
<-connCh
12-
return clipboard.WriteAll(lemon.ConvertLineEnding(text, lineEndingOpt))
12+
return clipboard.WriteAll(lemon.ConvertLineEnding(text, LineEndingOpt))
1313
}
1414

1515
func (_ *Clipboard) Paste(_ struct{}, resp *string) error {

server/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212

1313
var connCh = make(chan net.Conn, 1)
1414

15-
var lineEndingOpt string
15+
var LineEndingOpt string
1616

1717
func Serve(c *lemon.CLI) error {
1818
port := c.Port
1919
allowIP := c.Allow
20-
lineEndingOpt = c.LineEnding
20+
LineEndingOpt = c.LineEnding
2121
ra, err := iprange.New(allowIP)
2222
if err != nil {
2323
return err

0 commit comments

Comments
 (0)