diff --git a/play.it-2/changelog b/play.it-2/changelog index 4f8f290de3d34fe17a4384f914a49a3e14f7ea86..b99906a8ec782d6be3462c0cca7958728fa6eb34 100644 --- a/play.it-2/changelog +++ b/play.it-2/changelog @@ -17,6 +17,8 @@ * New option --skip-free-space-check: Bypass free space check, create temporary directories under $TMPDIR, defaults to /tmp + * Fix issue with pre-2.8 compatibility code in icons_linking_postinst + 2.10.5 * select_package_architecture: Fix bug when using --architecture=64 (or diff --git a/play.it-2/src/00_header.sh b/play.it-2/src/00_header.sh index 53659795b59f0e29a1e7a1ed41647b6502e73e39..b177a389d8979650d43c0a0503af5389298fd9f1 100644 --- a/play.it-2/src/00_header.sh +++ b/play.it-2/src/00_header.sh @@ -37,5 +37,5 @@ library_version=2.11.0~dev # shellcheck disable=SC2034 -library_revision=20181219.1 +library_revision=20190120.1 diff --git a/play.it-2/src/30_icons.sh b/play.it-2/src/30_icons.sh index e360bf346e770f1abf1a008390b7d8e1c02d456c..a83656ddf1927b976cbe6e4db63e642ddf310151 100644 --- a/play.it-2/src/30_icons.sh +++ b/play.it-2/src/30_icons.sh @@ -299,13 +299,15 @@ icons_linking_postinst() { [ "$name" ] || name="$GAME_ID" for icon in $list; do file="$(get_value "$icon")" - if - { [ $version_major_target -lt 2 ] || [ $version_minor_target -lt 8 ] ; } && - ( ls "$path/$file" >/dev/null 2>&1 || ls "$path"/$file >/dev/null 2>&1 ) - then - icon_get_resolution_from_file "$path/$file" + if [ $version_major_target -lt 2 ] || [ $version_minor_target -lt 8 ]; then + # ensure compatibility with scripts targeting pre-2.8 library + if [ -e "$path/$file" ] || [ -e "$path"/$file ]; then + icon_get_resolution_from_file "$path/$file" + else + icon_get_resolution_from_file "${PKG_DATA_PATH}${PATH_GAME}/$file" + fi else - icon_get_resolution_from_file "${PKG_DATA_PATH}${PATH_GAME}/$file" + icon_get_resolution_from_file "$path/$file" fi path_icon="$PATH_ICON_BASE/$resolution/apps" if