librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Rename start-librewolf.desktop to librewolf.desktop

Browse source 
So that it matches the executable name (/usr/bin/librewolf) and the
filename used in the FAQ (librewolf.desktop)[1].

This also makes the filename consistent with the one used on other
platforms (such as on Arch Linux[2]) and with what is used by Firefox
(firefox.desktop).

Commands used to search and replace:

    $ git grep -Flz start-librewolf.desktop | xargs -0 -I '{}' sh -c \
      "printf '%s\n' \"\$(sed \
        's/start-librewolf/librewolf/g' '{}')\" >'{}'"

[1] 1c5a673547/pages/docs/faq.md
[2] ecb7338cbe/librewolf.desktop

Fixes: https://github.com/netblue30/firejail/issues/5460
This commit is contained in:
Kelvin M. Klann 2023-04-11 17:14:46 -03:00
parent 66b780ea0d
commit 06af8517f2
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assets/linux.artifacts.mk
View file

@ -20,7 +20,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
(cd work && tar xf ../$<) (cd work && tar xf ../$<)
cp -v assets/linux.build-deb.sh work/ cp -v assets/linux.build-deb.sh work/
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true [ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop) (cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > librewolf.desktop)
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cd work && bash linux.build-deb.sh $(full_version)) (cd work && bash linux.build-deb.sh $(full_version))
else else
@ -46,7 +46,7 @@ librewolf-$(full_version).$(fc).x86_64.rpm : $(infile)
cp -v release work cp -v release work
cp -v source_release work cp -v source_release work
cp -v assets/linux.librewolf.spec work/librewolf.spec cp -v assets/linux.librewolf.spec work/librewolf.spec
cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in cp -v assets/linux.librewolf.desktop.in work/librewolf/librewolf.desktop.in
cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true [ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi
@ -66,4 +66,3 @@ endif
artifacts-rpm : $(infile) $(infile).sha256sum artifacts-rpm : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum sha256sum -c $(infile).sha256sum
${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm

2
assets/linux.build-deb.sh
View file

@ -42,7 +42,7 @@ cp -v usr/share/librewolf/browser/chrome/icons/default/default16.png usr/share/i
cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png
cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png
cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png
cp -v ../start-librewolf.desktop usr/share/applications/start-librewolf.desktop cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop
cd .. cd ..
dpkg-deb --build librewolf dpkg-deb --build librewolf

2
assets/linux.build-rpm.sh
View file

@ -67,7 +67,7 @@ cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/defaul
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png
sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
tar cvfz lw.tar.gz librewolf-$version tar cvfz lw.tar.gz librewolf-$version
# todo perhaps: rm -rf librwolf-$version # todo perhaps: rm -rf librwolf-$version

3
assets/linux.librewolf.spec
View file

@ -61,6 +61,7 @@ cp -rv * "$RPM_BUILD_ROOT"
/usr/share/librewolf/librewolf /usr/share/librewolf/librewolf
/usr/share/librewolf/librewolf-bin /usr/share/librewolf/librewolf-bin
/usr/share/librewolf/librewolf.cfg /usr/share/librewolf/librewolf.cfg
/usr/share/librewolf/librewolf.desktop.in
/usr/share/librewolf/librewolf.ico /usr/share/librewolf/librewolf.ico
/usr/share/librewolf/libsmime3.so /usr/share/librewolf/libsmime3.so
/usr/share/librewolf/libsoftokn3.so /usr/share/librewolf/libsoftokn3.so
@ -69,5 +70,3 @@ cp -rv * "$RPM_BUILD_ROOT"
/usr/share/librewolf/omni.ja /usr/share/librewolf/omni.ja
/usr/share/librewolf/platform.ini /usr/share/librewolf/platform.ini
/usr/share/librewolf/plugin-container /usr/share/librewolf/plugin-container
/usr/share/librewolf/start-librewolf.desktop.in