Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.

Commit 7d1a06b

Browse files
abdfnxabdfnx
authored
Merge branch 'scmn-dev:main' into main
2 parents 3bc3b34 + f9f2d41 commit 7d1a06b

File tree

17 files changed

+39
-39
lines changed

17 files changed

+39
-39
lines changed

‎api/get-latest.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package api
22

33
import (
4-
"os"
54
"fmt"
6-
"time"
7-
"net/http"
85
"io/ioutil"
6+
"net/http"
7+
"os"
8+
"time"
99

10-
"github.com/briandowns/spinner"
1110
httpClient "github.com/abdfnx/resto/client"
11+
"github.com/briandowns/spinner"
1212
)
1313

1414
func GetLatest(product string, isChecker bool) string {
@@ -28,7 +28,7 @@ func GetLatest(product string, isChecker bool) string {
2828

2929
if err != nil {
3030
fmt.Printf("Error creating request: %s \n", err.Error())
31-
os.Exit(0)
31+
os.Exit(2)
3232
}
3333

3434
suffix := " 🔍 Requesting..."

‎cli/auth.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func LoginCMD() *cobra.Command{
7070
} else {
7171
if err := tea.NewProgram(login.Login()).Start(); err != nil {
7272
fmt.Printf("could not start program: %s\n", err)
73-
os.Exit(1)
73+
os.Exit(2)
7474
}
7575
}
7676

@@ -105,7 +105,7 @@ func LogoutCMD() *cobra.Command {
105105
} else {
106106
if err := tea.NewProgram(logout.Logout()).Start(); err != nil {
107107
fmt.Printf("could not start program: %s\n", err)
108-
os.Exit(1)
108+
os.Exit(2)
109109
}
110110
}
111111

@@ -128,7 +128,7 @@ var CreateCMD = &cobra.Command{
128128
if err != nil {
129129
fmt.Printf("could not open browser: %s\n", err)
130130

131-
os.Exit(1)
131+
os.Exit(2)
132132
}
133133

134134
return nil
@@ -142,7 +142,7 @@ var RefreshCMD = &cobra.Command{
142142
RunE: func(cmd *cobra.Command, args []string) error {
143143
if err := tea.NewProgram(refresh.Refresh()).Start(); err != nil {
144144
fmt.Printf("could not start program: %s\n", err)
145-
os.Exit(1)
145+
os.Exit(2)
146146
}
147147

148148
return nil

‎cli/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func DeleteCMD() *cobra.Command {
2222

2323
if err := tea.NewProgram(delete.Delete(&PwOpts)).Start(); err != nil {
2424
fmt.Printf("could not start program: %s\n", err)
25-
os.Exit(1)
25+
os.Exit(2)
2626
}
2727

2828
return nil

‎cli/docs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package cli
22

33
import (
4-
"os"
54
"fmt"
5+
"os"
66

7-
"github.com/spf13/cobra"
87
"github.com/scmn-dev/browser"
8+
"github.com/spf13/cobra"
99
)
1010

1111
var DocsCMD = &cobra.Command{
@@ -18,7 +18,7 @@ var DocsCMD = &cobra.Command{
1818
if err != nil {
1919
fmt.Printf("could not open browser: %s\n", err)
2020

21-
os.Exit(1)
21+
os.Exit(2)
2222
}
2323
},
2424
}

‎cli/encrypt.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package cli
22

33
import (
4-
"io"
5-
"os"
6-
"fmt"
74
"crypto/aes"
5+
"crypto/cipher"
86
"crypto/md5"
9-
"crypto/rand"
10-
"crypto/cipher"
7+
"crypto/rand"
118
"crypto/sha256"
129
"crypto/sha512"
10+
"fmt"
11+
"io"
12+
"os"
1313

1414
"github.com/spf13/cobra"
1515
)
@@ -23,7 +23,7 @@ func EncryptCMD() *cobra.Command {
2323
if EncryptOpts.AES {
2424
if len(EncryptOpts.AESKey) < 32 {
2525
fmt.Println("AES key must be 32 characters or longer.")
26-
os.Exit(1)
26+
os.Exit(2)
2727
} else {
2828
text := []byte(args[0])
2929
key := []byte(EncryptOpts.AESKey)
@@ -60,7 +60,7 @@ func EncryptCMD() *cobra.Command {
6060
fmt.Printf("%x\n", hash)
6161
} else {
6262
fmt.Println("No encryption algorithm selected.")
63-
os.Exit(1)
63+
os.Exit(2)
6464
}
6565
},
6666
}

‎cli/insert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func InsertCMD() *cobra.Command {
1818
RunE: func(cmd *cobra.Command, args []string) error {
1919
if err := tea.NewProgram(insert.Insert(&PwOpts)).Start(); err != nil {
2020
fmt.Printf("could not start program: %s\n", err)
21-
os.Exit(1)
21+
os.Exit(2)
2222
}
2323

2424
return nil

‎cli/list.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func ListCMD() *cobra.Command {
4141

4242
fmt.Println(lipgloss.NewStyle().PaddingLeft(2).SetString(constants.Logo("Secman Lister") + st.Wrap.Render(head + body)).String())
4343

44-
os.Exit(0)
44+
os.Exit(2)
4545
}
4646

4747
fmt.Println(errout)
@@ -51,7 +51,7 @@ func ListCMD() *cobra.Command {
5151
} else {
5252
if err := tea.NewProgram(lister.Lister(), tea.WithAltScreen()).Start(); err != nil {
5353
fmt.Printf("could not start program: %s\n", err)
54-
os.Exit(1)
54+
os.Exit(2)
5555
}
5656
}
5757

‎cli/read.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ func ReadCMD() *cobra.Command {
4545

4646
if err != nil {
4747
fmt.Println(errout)
48-
os.Exit(1)
48+
os.Exit(2)
4949
} else {
5050
fmt.Print("\n" + out)
5151
}
5252
} else {
5353
if err := tea.NewProgram(read.Read(&PwOpts)).Start(); err != nil {
5454
fmt.Printf("could not start program: %s\n", err)
55-
os.Exit(0)
55+
os.Exit(2)
5656
}
5757
}
5858

‎pkg/auth/login/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (m model) View() string {
193193

194194
if m.message != "" {
195195
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
196-
os.Exit(0)
196+
os.Exit(2)
197197
}
198198
}
199199

‎pkg/auth/logout/logout.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (m model) View() string {
127127
if user == "" {
128128
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(constants.Logo("Secman Auth") + m.styles.Error.Render("\n\nYou are not logged in. Please use ") + m.styles.Subtle.Render("`secman auth login`") + m.styles.Error.Render(" command to login.")))
129129

130-
os.Exit(0)
130+
os.Exit(2)
131131

132132
return ""
133133
} else {
@@ -142,7 +142,7 @@ func (m model) View() string {
142142

143143
if m.message != "" {
144144
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
145-
os.Exit(0)
145+
os.Exit(2)
146146
}
147147
}
148148

‎pkg/auth/refresh/refresh.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (m model) View() string {
193193
if user == "" {
194194
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(constants.Logo("Secman Auth") + m.styles.Error.Render("\n\nYou are not logged in. Please use ") + m.styles.Subtle.Render("`secman auth login`") + m.styles.Error.Render(" command to login.")))
195195

196-
os.Exit(0)
196+
os.Exit(2)
197197

198198
return ""
199199
} else {
@@ -208,7 +208,7 @@ func (m model) View() string {
208208

209209
if m.message != "" {
210210
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
211-
os.Exit(0)
211+
os.Exit(2)
212212
}
213213
}
214214

‎pkg/pipe/delete/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (m model) View() string {
162162

163163
if m.message != "" {
164164
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
165-
os.Exit(0)
165+
os.Exit(2)
166166
}
167167
}
168168

‎pkg/pipe/edit/edit.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
4141
if ok {
4242
if err := tea.NewProgram(editor.Editor(m.pwType, string(i), m.password)).Start(); err != nil {
4343
fmt.Printf("could not start editor: %s\n", err)
44-
os.Exit(1)
44+
os.Exit(2)
4545
}
4646
}
4747

@@ -93,6 +93,6 @@ func Edit(o *options.PasswordsOptions) {
9393

9494
if err := tea.NewProgram(m).Start(); err != nil {
9595
fmt.Println("Error running program:", err)
96-
os.Exit(1)
96+
os.Exit(2)
9797
}
9898
}

‎pkg/pipe/edit/editor/editor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (m model) View() string {
219219

220220
if m.message != "" {
221221
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
222-
os.Exit(0)
222+
os.Exit(2)
223223
}
224224
}
225225

‎pkg/pipe/insert/insert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (m model) View() string {
331331

332332
if m.message != "" {
333333
fmt.Println(lipgloss.NewStyle().Padding(0, 2).SetString(m.message).String())
334-
os.Exit(0)
334+
os.Exit(2)
335335
}
336336
}
337337

‎pkg/pipe/lister/passwords.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func readPasswords(p string) []list.Item {
4747
fmt.Println(err)
4848
fmt.Println(errout)
4949

50-
os.Exit(1)
50+
os.Exit(2)
5151
}
5252

5353
s.Stop()
@@ -60,7 +60,7 @@ func readPasswords(p string) []list.Item {
6060

6161
fmt.Println(lipgloss.NewStyle().PaddingLeft(2).SetString(constants.Logo("Secman Lister") + st.Wrap.Render(head + body)).String())
6262

63-
os.Exit(0)
63+
os.Exit(2)
6464
}
6565

6666
viper.SetConfigType("yaml")

‎pkg/pipe/read/read.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func Read(o *options.PasswordsOptions) model {
5858
if err != nil {
5959
fmt.Println(err)
6060
fmt.Println(errout)
61-
os.Exit(0)
61+
os.Exit(2)
6262
}
6363

6464
s.Stop()
@@ -69,7 +69,7 @@ func Read(o *options.PasswordsOptions) model {
6969

7070
fmt.Println(lipgloss.NewStyle().PaddingLeft(2).SetString(constants.Logo("Secman Reader") + m.styles.Wrap.Render(head + body)).String())
7171

72-
os.Exit(0)
72+
os.Exit(2)
7373
} else if o.Logins {
7474
title := gjson.Get(out, "title")
7575
url := gjson.Get(out, "url")

0 commit comments

Comments
 (0)