From f98760d1ddaf0d99b784a967e4da6f9293620386 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Wed, 17 Dec 2025 12:18:07 +0200 Subject: [PATCH] Rearrange function order in utils.go --- src/bpmlib/utils.go | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bpmlib/utils.go b/src/bpmlib/utils.go index ab76323..9c747b3 100644 --- a/src/bpmlib/utils.go +++ b/src/bpmlib/utils.go @@ -18,20 +18,6 @@ type BPMLock struct { path string } -func (lock *BPMLock) Unlock() error { - err := lock.file.Close() - if err != nil { - return err - } - - err = os.Remove(lock.path) - if err != nil { - return err - } - - return nil -} - func LockBPM(rootDir string) (*BPMLock, error) { // Create parent directories if they don't already exist err := os.MkdirAll(path.Join(rootDir, "/var/lib/bpm"), 0755) @@ -54,6 +40,20 @@ func LockBPM(rootDir string) (*BPMLock, error) { return &BPMLock{f, path.Join(rootDir, "var/lib/bpm/bpm.lock")}, nil } +func (lock *BPMLock) Unlock() error { + err := lock.file.Close() + if err != nil { + return err + } + + err = os.Remove(lock.path) + if err != nil { + return err + } + + return nil +} + func GetArch() string { uname := syscall.Utsname{} err := syscall.Uname(&uname) @@ -69,6 +69,13 @@ func GetArch() string { return string(byteString[:indexLength]) } +func CompareVersions(version1, version2 string) int { + v1 := version.NewVersion(version1) + v2 := version.NewVersion(version2) + + return v1.Compare(v2) +} + func createProgressBar(max int64, description string, hideBar bool) *progressbar.ProgressBar { var output io.Writer if hideBar { @@ -145,10 +152,3 @@ func removeDuplicates[T comparable](sliceList []T) []T { } return list } - -func CompareVersions(version1, version2 string) int { - v1 := version.NewVersion(version1) - v2 := version.NewVersion(version2) - - return v1.Compare(v2) -}