Commit d84bb643 authored by Antoine Le Gonidec's avatar Antoine Le Gonidec

move_icons_to — Fix crash when --prefix is set to a custom value

parent 204e56f5
......@@ -19,6 +19,8 @@
* Fix issue with pre-2.8 compatibility code in icons_linking_postinst
* move_icons_to: Fix crash when --prefix is set to a custom value
2.10.5
* select_package_architecture: Fix bug when using --architecture=64 (or
......
......@@ -37,5 +37,5 @@
library_version=2.11.0~dev
# shellcheck disable=SC2034
library_revision=20190123.1
library_revision=20190126.1
......@@ -356,8 +356,8 @@ icons_move_to() {
(
cd "$source_path"
cp --link --parents --recursive --no-dereference --preserve=links "./$PATH_ICON_BASE" "$destination_path"
rm --recursive "./$PATH_ICON_BASE"
rmdir --ignore-fail-on-non-empty --parents "./${PATH_ICON_BASE%/*}"
rm --recursive "./$PATH_ICON_BASE"/*
rmdir --ignore-fail-on-non-empty --parents "${PATH_ICON_BASE#/}"
)
}
# compatibility alias
......
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