Skip to content

Commit 9cbaff8

Browse files
committed
Move these out of the top-level, to avoid clutter.
1 parent fe8df3b commit 9cbaff8

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

extcmds.go renamed to system/extcmds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// +build !darwin,!android,!windows
66

7-
package termshark
7+
package system
88

99
var CopyToClipboard = []string{"xsel", "-i", "-b"}
1010

extcmds_android.go renamed to system/extcmds_android.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// code is governed by the MIT license that can be found in the LICENSE
33
// file.
44

5-
package termshark
5+
package system
66

77
var CopyToClipboard = []string{"termux-clipboard-set"}
88

extcmds_darwin.go renamed to system/extcmds_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// code is governed by the MIT license that can be found in the LICENSE
33
// file.
44

5-
package termshark
5+
package system
66

77
var CopyToClipboard = []string{"pbcopy"}
88

extcmds_windows.go renamed to system/extcmds_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// code is governed by the MIT license that can be found in the LICENSE
33
// file.
44

5-
package termshark
5+
package system
66

77
var CopyToClipboard = []string{"clip"}
88

ui/ui.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ func openCopyChoices(copyLen int, app gowid.IApp) {
751751

752752
copyCmd := termshark.ConfStringSlice(
753753
"main.copy-command",
754-
termshark.CopyToClipboard,
754+
system.CopyToClipboard,
755755
)
756756

757757
if len(copyCmd) == 0 {

utils.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/blang/semver"
3333
"github.com/gcla/gowid"
3434
"github.com/gcla/gowid/gwutil"
35+
"github.com/gcla/termshark/system"
3536
"github.com/gcla/termshark/widgets/resizable"
3637
"github.com/mattn/go-isatty"
3738
"github.com/pkg/errors"
@@ -795,7 +796,7 @@ func ApplyArguments(cmd []string, args []string) ([]string, int) {
795796
func BrowseUrl(url string) error {
796797
urlCmd := ConfStringSlice(
797798
"main.browse-command",
798-
OpenURL,
799+
system.OpenURL,
799800
)
800801

801802
if len(urlCmd) == 0 {
@@ -843,7 +844,7 @@ func CopyCommand(input io.Reader, cb interface{}) error {
843844

844845
copyCmd := ConfStringSlice(
845846
"main.copy-command",
846-
CopyToClipboard,
847+
system.CopyToClipboard,
847848
)
848849

849850
if len(copyCmd) == 0 {

0 commit comments

Comments
 (0)