From f211fb157121547e969031fe69dbeda27fffdca4 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 5 Dec 2023 01:10:26 -0600 Subject: hscript: meta/PkgInstall: Allow negative selection This allows the installation of 'negative selections' or the purposeful exclusion of packages from the installed environment. --- hscript/meta.cc | 2 +- ui/qt5/resources/intro-high.png | Bin 360813 -> 325204 bytes ui/qt5/resources/intro-low.png | Bin 126573 -> 126206 bytes 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 ui/qt5/resources/intro-high.png mode change 100755 => 100644 ui/qt5/resources/intro-low.png diff --git a/hscript/meta.cc b/hscript/meta.cc index 8079b1a..e2d6d28 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -220,7 +220,7 @@ bool Arch::execute() const { } -static std::regex valid_pkg("[0-9A-Za-z+_.-]*((>?<|[<>]?=|[~>])[0-9A-Za-z-_.]+)?"); +static std::regex valid_pkg("[!]?[0-9A-Za-z+_.-]*((>?<|[<>]?=|[~>])[0-9A-Za-z-_.]+)?"); Key *PkgInstall::parseFromData(const std::string &data, diff --git a/ui/qt5/resources/intro-high.png b/ui/qt5/resources/intro-high.png old mode 100755 new mode 100644 index 91ea745..19b30b5 Binary files a/ui/qt5/resources/intro-high.png and b/ui/qt5/resources/intro-high.png differ diff --git a/ui/qt5/resources/intro-low.png b/ui/qt5/resources/intro-low.png old mode 100755 new mode 100644 index 191c136..4d0e6f6 Binary files a/ui/qt5/resources/intro-low.png and b/ui/qt5/resources/intro-low.png differ -- cgit v1.2.3-60-g2f50