summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/modules/vmware12/module.build11
-rw-r--r--core/modules/vmware15/module.build10
2 files changed, 16 insertions, 5 deletions
diff --git a/core/modules/vmware12/module.build b/core/modules/vmware12/module.build
index c7cc8c67..99f7026b 100644
--- a/core/modules/vmware12/module.build
+++ b/core/modules/vmware12/module.build
@@ -212,9 +212,14 @@ build() {
}
post_copy() {
- # Update Icon cache for vmplayer
- gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed."
-
+ # Update Icon cache for vmplayer, older versions had the version in their names, newer do not...
+ for guic in gtk-update-icon-cache{,-3.0} fail; do
+ if [ "$guid" = "fail" ]; then
+ pwarning "Updating icon cache failed."
+ break
+ fi
+ "$guid" "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/"
+ done
# fix vmware-usbarbitrator bug
date +'%Y.%m.%d' >"${TARGET_BUILD_DIR}/etc/arch-release"
diff --git a/core/modules/vmware15/module.build b/core/modules/vmware15/module.build
index cfb6fb39..3b7d5ff3 100644
--- a/core/modules/vmware15/module.build
+++ b/core/modules/vmware15/module.build
@@ -146,8 +146,14 @@ post_copy() {
# FIXME: gconftool is copied without dependencies
tarcopy "$(find /usr/lib/ /usr/lib64 -name gconv -type d)" "$TARGET_BUILD_DIR"
- # Update Icon cache for vmplayer
- gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed."
+ # Update Icon cache for vmplayer, older versions had the version in their names, newer do not...
+ for guic in gtk-update-icon-cache{,-3.0} fail; do
+ if [ "$guid" = "fail" ]; then
+ pwarning "Updating icon cache failed."
+ break
+ fi
+ "$guid" "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/"
+ done
# fix vmware-usbarbitrator bug
date +'%Y.%m.%d' >"${TARGET_BUILD_DIR}/etc/arch-release"