Properly close files to fix various issues on Windows (fixes GPG keygen, note temp files not being deleted)

This commit is contained in:
2024-03-08 12:19:05 -05:00
parent 404f24d361
commit 82b4fbee64
2 changed files with 11 additions and 3 deletions
+8 -3
View File
@@ -102,6 +102,9 @@ func editNote(baseNote []string) ([]string, bool) {
}
}
// close tempFile
tempFile.Close()
// edit the tempFile (note) with the user's text editor
cmd := exec.Command(editor, tempFile.Name())
cmd.Stdout = os.Stdout
@@ -114,20 +117,22 @@ func editNote(baseNote []string) ([]string, bool) {
}
// open the tempFile for reading
file, err := os.Open(tempFile.Name())
tempFile, err = os.Open(tempFile.Name())
if err != nil {
fmt.Println(offline.AnsiError + "Failed to open temporary file (\"" + tempFile.Name() + "\") " + err.Error() + offline.AnsiReset)
os.Exit(1)
}
defer file.Close()
// read the edited note from the tempFile
var note []string
scanner := bufio.NewScanner(file)
scanner := bufio.NewScanner(tempFile)
for scanner.Scan() {
note = append(note, scanner.Text())
}
// close the tempFile
tempFile.Close()
// return the edited note if it is different from baseNote
if !reflect.DeepEqual(offline.RemoveTrailingEmptyStrings(note), baseNote) {
return note, true
+3
View File
@@ -55,6 +55,9 @@ func GpgKeyGen() string {
unixTime := strconv.FormatInt(time.Now().Unix(), 10)
gpgGenTempFile.WriteString(strings.Join([]string{"Key-Type: eddsa", "Key-Curve: ed25519", "Key-Usage: sign", "Subkey-Type: ecdh", "Subkey-Curve: cv25519", "Subkey-Usage: encrypt", "Name-Real: libmutton-" + unixTime, "Name-Comment: gpg-libmutton", "Name-Email: github.com/rwinkhart/libmutton", "Expire-Date: 0"}, "\n"))
// close gpg-gen file
gpgGenTempFile.Close()
// generate GPG key based on gpg-gen file
cmd := exec.Command("gpg", "-q", "--batch", "--generate-key", gpgGenTempFile.Name())
cmd.Stdout = os.Stdout