tazwok rev 23

Fixe home made .desktop or icon copy)
author Christophe Lincoln <pankso@slitaz.org>
date Mon Feb 04 16:48:13 2008 +0100 (2008-02-04)
parents 560d6f33e8ce
children 47584d26ad16
files tazwok
line diff
     1.1 --- a/tazwok	Sat Feb 02 13:34:06 2008 +0100
     1.2 +++ b/tazwok	Mon Feb 04 16:48:13 2008 +0100
     1.3 @@ -277,6 +277,7 @@
     1.4  # This function is executed by gen_package when 'tazwok genpkg'.
     1.5  copy_generic_files()
     1.6  {
     1.7 +	cd $WOK/$PACKAGE
     1.8  	# In most case locale are in $_pkg/usr/share/locale so we copy files
     1.9  	# using generic variables and $LOCALE from Tazwok config file.
    1.10  	if [ ! "$LOCALE" = "" ]; then
    1.11 @@ -296,20 +297,20 @@
    1.12  			mkdir -p $fs/usr/share/pixmaps
    1.13  			cp -a $_pkg/usr/share/pixmaps/$PACKAGE.* \
    1.14  				$fs/usr/share/pixmaps 2>/dev/null
    1.15 -			# Custom or home made PNG pixmap can be in stuff.
    1.16 -			if [ -f "stuff/$PACKAGE.png" ]; then
    1.17 -				cp -a stuff/$PACKAGE.png $fs/usr/share/pixmaps
    1.18 -			fi
    1.19 +		fi
    1.20 +		# Custom or home made PNG pixmap can be in stuff.
    1.21 +		if [ -f "stuff/$PACKAGE.png" ]; then
    1.22 +			cp -a stuff/$PACKAGE.png $fs/usr/share/pixmaps
    1.23  		fi
    1.24  	fi
    1.25  	# Desktop entry (.desktop).
    1.26  	if [ -d "$_pkg/usr/share/applications" ]; then
    1.27  		cp -a $_pkg/usr/share/applications $fs/usr/share
    1.28 -		# Home made desktop file can be in stuff.
    1.29 -		if [ -f "stuff/$PACKAGE.desktop" ]; then
    1.30 -			mkdir -p $fs/usr/share/applications
    1.31 -			cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications
    1.32 -		fi
    1.33 +	fi
    1.34 +	# Home made desktop file can be in stuff.
    1.35 +	if [ -f "stuff/$PACKAGE.desktop" ]; then
    1.36 +		mkdir -p $fs/usr/share/applications
    1.37 +		cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications
    1.38  	fi
    1.39  }
    1.40