get-scripts diff firefox-official @ rev 68

kiwix: typo (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 22 09:00:18 2017 +0100 (2017-03-22)
parents 46953571ee2a
children ebbc906a623e
line diff
     1.1 --- a/firefox-official	Sun Jun 07 00:37:03 2015 +0200
     1.2 +++ b/firefox-official	Wed Mar 22 09:00:18 2017 +0100
     1.3 @@ -15,23 +15,18 @@
     1.4  DEPENDS="gtk+"
     1.5  
     1.6  wget $WGET_URL
     1.7 -[ -f $TARBALL ] ||
     1.8 -abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
     1.9 +[ -f $TARBALL ] || abort_package
    1.10  
    1.11 -DESTDIR=$PWD/$PACKAGE-$VERSION/fs
    1.12 +USR=$PWD/$PACKAGE-$VERSION/fs/usr
    1.13  
    1.14 -mkdir -p \
    1.15 -	$DESTDIR/usr/bin \
    1.16 -	$DESTDIR/usr/lib/firefox-$VERSION \
    1.17 -	$DESTDIR/usr/share/applications \
    1.18 -	$DESTDIR/usr/share/pixmaps
    1.19 -tar xjf $TARBALL -C $DESTDIR/usr/lib/firefox-$VERSION
    1.20 +mkdir -p $USR/bin $USR/lib/firefox-$VERSION $USR/share/applications $USR/share/pixmaps
    1.21 +tar xjf $TARBALL -C $USR/lib/firefox-$VERSION
    1.22  # /usr/bin/firefox-official + pixmap
    1.23 -cd $DESTDIR/usr/bin
    1.24 +cd $USR/bin
    1.25  ln -s $(find ../lib/firefox-$VERSION | sed '/firefox-bin$/!dq') $PACKAGE
    1.26 -cd $DESTDIR/usr/share/pixmaps
    1.27 +cd $USR/share/pixmaps
    1.28  ln -s $(find ../../lib/firefox-$VERSION | sed '/zicon128.png$/!dq') $PACKAGE.png
    1.29 -cat > $DESTDIR/usr/share/applications/$PACKAGE.desktop <<EOT
    1.30 +cat > $USR/share/applications/$PACKAGE.desktop <<EOT
    1.31  [Desktop Entry]
    1.32  Type=Application
    1.33  Name=Firefox Web Browser (official)
    1.34 @@ -41,4 +36,4 @@
    1.35  Categories=Network;WebBrowser;
    1.36  EOT
    1.37  # Remove updater files (users can't upgrade anyway)
    1.38 -rm -f $DESTDIR/usr/lib/firefox-$VERSION/update*
    1.39 +rm -f $USR/lib/firefox-$VERSION/update*