get-scripts diff opera @ 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 2cdf3e534506
children 8e84604f9739
line diff
     1.1 --- a/opera	Sat Apr 23 13:31:41 2016 +0200
     1.2 +++ b/opera	Wed Mar 22 09:00:18 2017 +0100
     1.3 @@ -17,7 +17,7 @@
     1.4  	[ -s $TARBALL ] && break
     1.5  done
     1.6  
     1.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
     1.8 +[ -f $TARBALL ] || abort_package
     1.9  
    1.10  mkdir $PACKAGE
    1.11  dpkg-deb -e $TARBALL $PACKAGE/meta
    1.12 @@ -31,14 +31,14 @@
    1.13  MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
    1.14  VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
    1.15  mv $PACKAGE $PACKAGE-$VERSION
    1.16 -cd $PACKAGE-$VERSION/fs
    1.17 +USR=$PACKAGE-$VERSION/fs/usr
    1.18  
    1.19  # Localized keyboard layout fix
    1.20 -busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i usr/bin/opera
    1.21 +busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i $USR/bin/opera
    1.22  
    1.23  # Create menu
    1.24 -mkdir -p usr/share/applications
    1.25 -cat > usr/share/applications/opera-browser.desktop <<EOT
    1.26 +mkdir -p $USR/share/applications
    1.27 +cat > $USR/share/applications/opera-browser.desktop <<EOT
    1.28  [Desktop Entry]
    1.29  Type=Application
    1.30  Name=Opera
    1.31 @@ -72,16 +72,13 @@
    1.32  Icon=opera-browser
    1.33  MimeType=text/html;text/xml;application/xhtml+xml;application/x-mimearchive;application/xml;application/rss+xml;application/rdf+xml;image/svg+xml;image/gif;image/jpeg;image/png;image/x-bmp;image/x-xbm;application/mime;
    1.34  EOT
    1.35 -cd ../..
    1.36  
    1.37  # Remove unwanted locale
    1.38 -mv $PACKAGE-$VERSION/fs/usr/share/opera/locale $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
    1.39 -mkdir -p $PACKAGE-$VERSION/fs/usr/share/opera/locale 
    1.40 +mv $USR/share/opera/locale $USR/share/opera/locale-full
    1.41 +mkdir -p $USR/share/opera/locale 
    1.42  . /etc/locale.conf
    1.43  for i in $LANG ${LANG/_/-} ${LANG:0:2} en fr ru pt de zh-cn ; do
    1.44 -	[ -d $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i ] &&
    1.45 -	cp -a $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i \
    1.46 -		$PACKAGE-$VERSION/fs/usr/share/opera/locale
    1.47 +	[ -d $USR/share/opera/locale-full/$i ] &&
    1.48 +	mv $USR/share/opera/locale-full/$i $USR/share/opera/locale
    1.49  done
    1.50 -rm -rf $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
    1.51 -rm -rf $PACKAGE-$VERSION/fs/usr/share/pixmaps
    1.52 +rm -rf $USR/share/opera/locale-full $USR/share/pixmaps