wok-next rev 20495
make-slitaz-icons: fix previous commit
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Mar 14 03:16:12 2018 +0200 (2018-03-14) |
parents | 47df087cffcf |
children | 6d367d984b77 |
files | make-slitaz-icons/receipt make-slitaz-icons/stuff/mksit.sh |
line diff
1.1 --- a/make-slitaz-icons/receipt Tue Mar 13 23:17:56 2018 +0200 1.2 +++ b/make-slitaz-icons/receipt Wed Mar 14 03:16:12 2018 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="make-slitaz-icons" 1.7 -VERSION="180313" 1.8 +VERSION="180314" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Make SliTaz icon theme" 1.11 MAINTAINER="al.bobylev@gmail.com"
2.1 --- a/make-slitaz-icons/stuff/mksit.sh Tue Mar 13 23:17:56 2018 +0200 2.2 +++ b/make-slitaz-icons/stuff/mksit.sh Wed Mar 14 03:16:12 2018 +0200 2.3 @@ -3,7 +3,7 @@ 2.4 # Aleksej Bobylev <al.bobylev@gmail.com>, 2014-2017 2.5 # (Started in November 2014) 2.6 2.7 -VERSION="180313" 2.8 +VERSION="180314" 2.9 2.10 . /lib/libtaz.sh 2.11 2.12 @@ -75,11 +75,12 @@ 2.13 fi 2.14 # Multiple choice. Choose one with /$SIZE/ in the path. 2.15 # Or choose other with /$SIZEx$SIZE. Or choose just the first one. 2.16 - FINDICON="$(echo "$FINDICON" | grep "/$SIZE/")" 2.17 - if [ "$(echo "$FINDICON" | wc -l)" -ne 1 ]; then 2.18 - FINDICON="$(echo "$FINDICON" | grep "/${SIZE}x${SIZE}/")" 2.19 - if [ "$(echo "$FINDICON" | wc -l)" -ne 1 ]; then 2.20 - FINDICON="$(echo "$FINDICON" | head -n1)" 2.21 + FINDICONorig="$FINDICON" 2.22 + FINDICON="$(echo "$FINDICONorig" | grep "/$SIZE/" | head -n1)" 2.23 + if [ -z "$FINDICON" ]; then 2.24 + FINDICON="$(echo "$FINDICONorig" | grep "/${SIZE}x${SIZE}/" | head -n1)" 2.25 + if [ -z "$FINDICON" ]; then 2.26 + FINDICON="$(echo "$FINDICONorig" | head -n1)" 2.27 fi 2.28 fi 2.29 fi