diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk index 2280cb5..92a8a99 100644 --- a/assets/linux.artifacts.mk +++ b/assets/linux.artifacts.mk @@ -20,7 +20,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile) (cd work && tar xf ../$<) cp -v assets/linux.build-deb.sh work/ [ "$(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) (cd work && bash linux.build-deb.sh $(full_version)) else @@ -46,7 +46,7 @@ librewolf-$(full_version).$(fc).x86_64.rpm : $(infile) cp -v release work cp -v source_release work 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 [ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi @@ -66,4 +66,3 @@ endif artifacts-rpm : $(infile) $(infile).sha256sum sha256sum -c $(infile).sha256sum ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm - diff --git a/assets/linux.build-deb.sh b/assets/linux.build-deb.sh index bac2b51..84aeefc 100755 --- a/assets/linux.build-deb.sh +++ b/assets/linux.build-deb.sh @@ -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/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 ../start-librewolf.desktop usr/share/applications/start-librewolf.desktop +cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop cd .. dpkg-deb --build librewolf diff --git a/assets/linux.build-rpm.sh b/assets/linux.build-rpm.sh index c7bd87d..90b6368 100755 --- a/assets/linux.build-rpm.sh +++ b/assets/linux.build-rpm.sh @@ -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/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 -sed "s/MYDIR/\/usr\/share\/librewolf/g" librewolf-$version/usr/share/applications/librewolf.desktop +sed "s/MYDIR/\/usr\/share\/librewolf/g" librewolf-$version/usr/share/applications/librewolf.desktop tar cvfz lw.tar.gz librewolf-$version # todo perhaps: rm -rf librwolf-$version diff --git a/assets/linux.librewolf.spec b/assets/linux.librewolf.spec index 717ed21..bf2a7f2 100644 --- a/assets/linux.librewolf.spec +++ b/assets/linux.librewolf.spec @@ -61,6 +61,7 @@ cp -rv * "$RPM_BUILD_ROOT" /usr/share/librewolf/librewolf /usr/share/librewolf/librewolf-bin /usr/share/librewolf/librewolf.cfg +/usr/share/librewolf/librewolf.desktop.in /usr/share/librewolf/librewolf.ico /usr/share/librewolf/libsmime3.so /usr/share/librewolf/libsoftokn3.so @@ -69,5 +70,3 @@ cp -rv * "$RPM_BUILD_ROOT" /usr/share/librewolf/omni.ja /usr/share/librewolf/platform.ini /usr/share/librewolf/plugin-container -/usr/share/librewolf/start-librewolf.desktop.in -