wok diff firefox-official-fr/receipt @ rev 18803

firefox-official: allow updates; misc tiny edits
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Jan 12 19:09:34 2016 +0200 (2016-01-12)
parents 12758fe1494b
children 8b63895e0cae
line diff
     1.1 --- a/firefox-official-fr/receipt	Thu Jan 07 00:45:20 2016 +0200
     1.2 +++ b/firefox-official-fr/receipt	Tue Jan 12 19:09:34 2016 +0200
     1.3 @@ -19,30 +19,35 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	# Installation path
     1.8 +	fx='/opt/mozilla/firefox'
     1.9 +
    1.10  	mkdir -p \
    1.11 +		$install$fx \
    1.12  		$install/usr/bin \
    1.13 -		$install/usr/lib/firefox-$VERSION \
    1.14  		$install/usr/share/applications \
    1.15  		$install/usr/share/icons/hicolor/128x128/apps
    1.16  
    1.17 -	cp -a $src/* $install/usr/lib/firefox-$VERSION
    1.18 +	# Copy everything
    1.19 +	cp -a $src/* $install$fx
    1.20  
    1.21 -	# /usr/bin/firefox-official
    1.22 -	ln -s /usr/lib/firefox-$VERSION/firefox $install/usr/bin/firefox-official
    1.23 +	# Executable
    1.24 +	ln -s $fx/firefox $install/usr/bin/firefox-official
    1.25  
    1.26  	# Icons
    1.27 -	ln -s /usr/lib/firefox-$VERSION/browser/icons/mozicon128.png \
    1.28 +	ln -s $fx/browser/icons/mozicon128.png \
    1.29  		$install/usr/share/icons/hicolor/128x128/apps/firefox-official.png
    1.30  	for size in 16 32 48; do
    1.31  		icon_folder="$install/usr/share/icons/hicolor/${size}x$size/apps"
    1.32  		mkdir -p $icon_folder
    1.33 -		ln -s /usr/lib/firefox-$VERSION/browser/chrome/icons/default/default$size.png \
    1.34 +		ln -s $fx/browser/chrome/icons/default/default$size.png \
    1.35  			$icon_folder/firefox-official.png
    1.36  	done
    1.37  
    1.38 -	# Remove updater files (user can't upgrade anyway)
    1.39 -	rm -f $install/usr/lib/firefox-$VERSION/update*
    1.40 +	# Allow user updates (save user's and our traffic)
    1.41 +	chmod -R a+w $install$fx
    1.42  
    1.43 +	# Desktop shortcut
    1.44  	cp $stuff/firefox-official.desktop $install/usr/share/applications
    1.45  }
    1.46