mirror of
https://github.com/rwinkhart/libmutton.git
synced 2026-08-27 20:36:29 -04:00
Address JetBrains warnings
This commit is contained in:
+1
-1
@@ -21,7 +21,7 @@ func RCWDArgument() {
|
|||||||
if password == nil {
|
if password == nil {
|
||||||
os.Exit(0) // use os.Exit directly since this function is only intended for non-interactive CLI clients
|
os.Exit(0) // use os.Exit directly since this function is only intended for non-interactive CLI clients
|
||||||
}
|
}
|
||||||
daemon.Start([]byte(password))
|
daemon.Start(password)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DecryptFileToSlice decrypts an RCW wrapped file
|
// DecryptFileToSlice decrypts an RCW wrapped file
|
||||||
|
|||||||
+1
-2
@@ -12,9 +12,8 @@ var keyBytesProvider = func(sshKeyPath *string) ([]byte, error) {
|
|||||||
return nil, errors.New("unable to read private key: " + *sshKeyPath)
|
return nil, errors.New("unable to read private key: " + *sshKeyPath)
|
||||||
}
|
}
|
||||||
return key, nil
|
return key, nil
|
||||||
} else {
|
|
||||||
return nil, errors.New("unable to identify private key location (nil config)")
|
|
||||||
}
|
}
|
||||||
|
return nil, errors.New("unable to identify private key location (nil config)")
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBytes returns the SSH private key bytes.
|
// GetBytes returns the SSH private key bytes.
|
||||||
|
|||||||
@@ -201,6 +201,7 @@ func sftpSync(sshClient *ssh.Client, sshEntryRoot, sshAgeDir string, sshIsWindow
|
|||||||
// download the file
|
// download the file
|
||||||
_, err = remoteFile.WriteTo(localFile)
|
_, err = remoteFile.WriteTo(localFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
_ = localFile.Close()
|
||||||
return errors.New("unable to download remote file: " + err.Error())
|
return errors.New("unable to download remote file: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,12 +267,15 @@ func sftpSync(sshClient *ssh.Client, sshEntryRoot, sshAgeDir string, sshIsWindow
|
|||||||
var remoteFile *sftp.File
|
var remoteFile *sftp.File
|
||||||
remoteFile, err = sftpClient.OpenFile(remoteFileRealPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY)
|
remoteFile, err = sftpClient.OpenFile(remoteFileRealPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
_ = localFile.Close()
|
||||||
return errors.New("unable to create remote file: " + err.Error())
|
return errors.New("unable to create remote file: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// upload the file
|
// upload the file
|
||||||
_, err = localFile.WriteTo(remoteFile)
|
_, err = localFile.WriteTo(remoteFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
_ = localFile.Close()
|
||||||
|
_ = remoteFile.Close()
|
||||||
return errors.New("unable to upload local file: " + err.Error())
|
return errors.New("unable to upload local file: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user