Commit d7447977 authored by Ivan Mazhukin's avatar Ivan Mazhukin Committed by Vitaly Lipatov

epm desktop: restore metapackage's support; add kde; fix postin/postun message (eterbug #17617)

parent 8062b43e
...@@ -25,7 +25,7 @@ run_script() ...@@ -25,7 +25,7 @@ run_script()
shift shift
[ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH" [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
( unset EPMCURDIR ; export PATH=$SCPATH ; $script "$@" ) ( unset EPMCURDIR ; export PATH=$SCPATH ; $script "$@" ) || warning "Postinstall/postuninstall script for $de_name encountered an issue."
return return
} }
...@@ -81,6 +81,13 @@ get_repo_version() { ...@@ -81,6 +81,13 @@ get_repo_version() {
fi fi
} }
install_de_meta() {
local metapackages=$(get_value "$de_name" "metapackages")
[ -n "$metapackages" ] && epm install --manual-requires $metapackages
return
}
install_de() { install_de() {
local de_name=$1 local de_name=$1
...@@ -93,8 +100,12 @@ install_de() { ...@@ -93,8 +100,12 @@ install_de() {
message "Installing $de_name with dependencies: $dependencies" message "Installing $de_name with dependencies: $dependencies"
if ! install_de_meta $metapackages; then
message "Failed to install $de_name." && return 1
fi
if epm install $dependencies; then if epm install $dependencies; then
run_script "$de_name-postin" $de_name || warning "Postinstall script for $de_name encountered an issue." run_script "$de_name-postin" $de_name
message "$de_name successfully installed." message "$de_name successfully installed."
else else
fatal "Failed to install $de_name." fatal "Failed to install $de_name."
...@@ -116,7 +127,7 @@ remove_de() { ...@@ -116,7 +127,7 @@ remove_de() {
message "Removing $de_name with dependencies: $dependencies" message "Removing $de_name with dependencies: $dependencies"
if epm remove $dependencies; then if epm remove $dependencies; then
run_script "$de_name-postun" $de_name || warning "Postuninstall script for $de_name encountered an issue." run_script "$de_name-postun" $de_name
message "$de_name successfully removed." message "$de_name successfully removed."
else else
fatal "Failed to remove $de_name." fatal "Failed to remove $de_name."
......
{
"name": "kde",
"version": "25.01.0",
"installed": false,
"dependencies": [ "kde", "lightdm", "lightdm-kde-greeter", "plasma-discover", "power-profiles-daemon", "qt6-wayland", "wayland-utils", "vulkan-tools"],
"description": "Hyprland is a dynamic tiling Wayland compositor that doesn't sacrifice on it's looks",
"metapackages": [ "kde" ]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment