# HG changeset patch # User Aleksej Bobylev # Date 1520990172 -7200 # Node ID 3a83e0dce9d6fce04779cf3c0c9d328e0611509f # Parent 47df087cffcf6d5503d73ff7f375ad544042ad81 make-slitaz-icons: fix previous commit diff -r 47df087cffcf -r 3a83e0dce9d6 make-slitaz-icons/receipt --- a/make-slitaz-icons/receipt Tue Mar 13 23:17:56 2018 +0200 +++ b/make-slitaz-icons/receipt Wed Mar 14 03:16:12 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="make-slitaz-icons" -VERSION="180313" +VERSION="180314" CATEGORY="development" SHORT_DESC="Make SliTaz icon theme" MAINTAINER="al.bobylev@gmail.com" diff -r 47df087cffcf -r 3a83e0dce9d6 make-slitaz-icons/stuff/mksit.sh --- a/make-slitaz-icons/stuff/mksit.sh Tue Mar 13 23:17:56 2018 +0200 +++ b/make-slitaz-icons/stuff/mksit.sh Wed Mar 14 03:16:12 2018 +0200 @@ -3,7 +3,7 @@ # Aleksej Bobylev , 2014-2017 # (Started in November 2014) -VERSION="180313" +VERSION="180314" . /lib/libtaz.sh @@ -75,11 +75,12 @@ fi # Multiple choice. Choose one with /$SIZE/ in the path. # Or choose other with /$SIZEx$SIZE. Or choose just the first one. - FINDICON="$(echo "$FINDICON" | grep "/$SIZE/")" - if [ "$(echo "$FINDICON" | wc -l)" -ne 1 ]; then - FINDICON="$(echo "$FINDICON" | grep "/${SIZE}x${SIZE}/")" - if [ "$(echo "$FINDICON" | wc -l)" -ne 1 ]; then - FINDICON="$(echo "$FINDICON" | head -n1)" + FINDICONorig="$FINDICON" + FINDICON="$(echo "$FINDICONorig" | grep "/$SIZE/" | head -n1)" + if [ -z "$FINDICON" ]; then + FINDICON="$(echo "$FINDICONorig" | grep "/${SIZE}x${SIZE}/" | head -n1)" + if [ -z "$FINDICON" ]; then + FINDICON="$(echo "$FINDICONorig" | head -n1)" fi fi fi