GitHubMirror/libmutton
1
0
Fork 0
mirror of https://github.com/rwinkhart/libmutton.git synced 2026-09-03 07:37:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix init when no device ID directory exists

Browse Source
This commit is contained in:
RandyTheSilly
2025-06-01 16:40:24 -04:00
parent 4a0e0f8e9e
commit ca4913f054
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global/init.go
+1 -1
View File
@@ -19,7 +19,7 @@ func DirInit(preserveOldConfigDir bool) (string, error) {
// get old device ID before its potential removal // get old device ID before its potential removal
oldDeviceID, err := GetCurrentDeviceID() oldDeviceID, err := GetCurrentDeviceID()
if err != nil { if err != nil {
return "", errors.New("unable to get current device ID: " + err.Error()) oldDeviceID = FSMisc
} }
// remove existing config directory (if it exists and not in append mode) // remove existing config directory (if it exists and not in append mode)
synccycles/init.go
+6 -4
View File
@@ -35,10 +35,12 @@ func DeviceIDGen(oldDeviceID string) (string, string, error) {
cleanupOnFail := func() { cleanupOnFail := func() {
// remove new device ID file // remove new device ID file
os.RemoveAll(newDeviceIDPath) os.RemoveAll(newDeviceIDPath)
// restore old device ID file (if it has already been removed due to DirInit) if oldDeviceID != global.FSMisc {
if isAccessible, _ := back.TargetIsFile(oldDeviceIDPath, true); !isAccessible { // restore old device ID file (if it existed and has already been removed due to DirInit)
f, _ := os.OpenFile(oldDeviceIDPath, os.O_CREATE|os.O_WRONLY, 0600) if isAccessible, _ := back.TargetIsFile(oldDeviceIDPath, true); !isAccessible {
_ = f.Close() // error ignored; if the file could be created, it can probably be closed f, _ := os.OpenFile(oldDeviceIDPath, os.O_CREATE|os.O_WRONLY, 0600)
_ = f.Close() // error ignored; if the file could be created, it can probably be closed
}
} }
} }