Actually fixed the bug that could brick your system

This commit is contained in:
CapCreeperGR 2024-04-18 19:34:20 +03:00
parent c8fc1b902c
commit 92bb8f3602
5 changed files with 68 additions and 4 deletions

View File

@ -590,9 +590,21 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
} }
if len(filesDiff) != 0 { if len(filesDiff) != 0 {
fmt.Println("Removing obsolete files") fmt.Println("Removing obsolete files")
var symlinks []string
for _, f := range filesDiff { for _, f := range filesDiff {
f = path.Join(installDir, f) f = path.Join(installDir, f)
stat, err := os.Lstat(f) lstat, err := os.Lstat(f)
if os.IsNotExist(err) {
continue
}
if err != nil {
return err
}
if lstat.Mode() == os.ModeSymlink {
symlinks = append(symlinks, f)
continue
}
stat, err := os.Stat(f)
if os.IsNotExist(err) { if os.IsNotExist(err) {
continue continue
} }
@ -619,6 +631,26 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
} }
} }
} }
for _, f := range symlinks {
f = path.Join(installDir, f)
_, err := os.Lstat(f)
if os.IsNotExist(err) {
continue
}
if err != nil {
return err
}
_, err = filepath.EvalSymlinks(f)
if os.IsNotExist(err) {
err := os.Remove(f)
if err != nil {
return err
}
}
if err != nil {
return err
}
}
} }
return nil return nil
} }
@ -838,9 +870,21 @@ func RemovePackage(pkg, rootDir string) error {
installedDir := path.Join(rootDir, "var/lib/bpm/installed/") installedDir := path.Join(rootDir, "var/lib/bpm/installed/")
pkgDir := path.Join(installedDir, pkg) pkgDir := path.Join(installedDir, pkg)
files := GetPackageFiles(pkg, rootDir) files := GetPackageFiles(pkg, rootDir)
var symlinks []string
for _, file := range files { for _, file := range files {
file = path.Join(rootDir, file) file = path.Join(rootDir, file)
stat, err := os.Lstat(file) lstat, err := os.Lstat(file)
if os.IsNotExist(err) {
continue
}
if err != nil {
return err
}
if lstat.Mode() == os.ModeSymlink {
symlinks = append(symlinks, file)
continue
}
stat, err := os.Stat(file)
if os.IsNotExist(err) { if os.IsNotExist(err) {
continue continue
} }
@ -867,6 +911,26 @@ func RemovePackage(pkg, rootDir string) error {
} }
} }
} }
for _, file := range symlinks {
file = path.Join(rootDir, file)
_, err := os.Lstat(file)
if os.IsNotExist(err) {
continue
}
if err != nil {
return err
}
_, err = filepath.EvalSymlinks(file)
if os.IsNotExist(err) {
err := os.Remove(file)
if err != nil {
return err
}
}
if err != nil {
return err
}
}
err := os.RemoveAll(pkgDir) err := os.RemoveAll(pkgDir)
if err != nil { if err != nil {
return err return err

View File

@ -17,7 +17,7 @@ import (
/* A simple-to-use package manager */ /* A simple-to-use package manager */
/* ---------------------------------- */ /* ---------------------------------- */
var bpmVer = "0.1.5" var bpmVer = "0.1.6"
var subcommand = "help" var subcommand = "help"
var subcommandArgs []string var subcommandArgs []string

Binary file not shown.

View File

@ -1,6 +1,6 @@
name: bpm name: bpm
description: The Bubble Package Manager description: The Bubble Package Manager
version: 0.1.5 version: 0.1.6
url: https://gitlab.com/bubble-package-manager/bpm/ url: https://gitlab.com/bubble-package-manager/bpm/
license: GPL3 license: GPL3
architecture: x86_64 architecture: x86_64