epm repack.d: use fix_desktop_file

repack.d/Autodesk_EAGLE.sh

@@ -22,10 +22,7 @@ mkdir $BUILDROOT/opt
 mv $BUILDROOT/$ROOTDIR $BUILDROOT/opt/$PRODUCT
 subst "s|\"/$ROOTDIR/|\"/opt/$PRODUCT/|" $SPEC
 
-# add binary in standart path
-mkdir -p $BUILDROOT/usr/bin/
-ln -s /opt/$PRODUCT/eagle $BUILDROOT/usr/bin/$PRODUCT
-subst "s|%files|%files\n/usr/bin/$PRODUCT|" $SPEC
+add_bin_link_command
 
 # create desktop file
 mkdir -p $BUILDROOT/usr/share/applications/
@@ -38,8 +35,8 @@ Name=EAGLE
 Comment=PCB design: schematic capture, board layout, and autorouter
 
 # paths need to be absolute, no ~ allowed within this file
-Exec=/usr/bin/eagle
-Icon=/opt/eagle/bin/eagle-logo.png
+Exec=$PRODUCT
+Icon=$PRODUCT
 
 # meta data 
 Categories=Engineering;Electronics;
@@ -49,8 +46,8 @@ MimeType=application/x-eagle-schematic;application/x-eagle-board;application/x-e
 # used to group all windows under the same launcher icon
 StartupWMClass=eagle
 EOF
-subst "s|%files|%files\n/usr/share/applications/$PRODUCT.desktop|" $SPEC
-
+pack_file /usr/share/applications/$PRODUCT.desktop
+install_file /opt/eagle/bin/eagle-logo.png /usr/share/pixmaps/$PRODUCT.png
 
 # https://bugzilla.altlinux.org/44898
 remove_file /opt/eagle/lib/libxcb-dri2.so.0

repack.d/aimp.sh

@@ -21,3 +21,4 @@ subst "s|/usr/bin/sh|/bin/sh|" $BUILDROOT$PRODUCTDIR/aimp.bash
 
 install_file /opt/aimp/aimp.desktop /usr/share/applications/aimp.desktop
 
+fix_desktop_file /opt/aimp/aimp.bash $PRODUCT

repack.d/anydesk.sh

@@ -52,3 +52,4 @@ fi
 # preloaded from /usr/lib64/anydesk/, drop external requires
 filter_from_requires libpangox-1.0.so.0 libgdkglext-x11-1.0.so.0 libgtkglext-x11-1.0.so.0
 
+fix_desktop_file /usr/bin/$PRODUCT

repack.d/brave-browser.sh

@@ -23,3 +23,4 @@ use_system_xdg
 
 install_deps
 
+fix_desktop_file /usr/bin/$PRODUCTCUR

repack.d/chromium-gost-stable.sh

@@ -29,6 +29,8 @@ use_system_xdg
 
 install_deps
 
+fix_desktop_file /usr/bin/$PRODUCTCUR
+
 # TODO: report to the upstream
 subst 's|Name=Chromium-Gost|Name=Chromium-Gost Web Browser\nName[ru]=Веб-браузер Chromium-gost|' $BUILDROOT/usr/share/applications/*.desktop
 subst 's|GenericName=Web Browser|GenericName=Chromium-Gost Web Browser|' $BUILDROOT/usr/share/applications/*.desktop

repack.d/code.sh

@@ -5,6 +5,7 @@ BUILDROOT="$1"
 SPEC="$2"
 
 PRODUCT=code
+PRODUCTCUR=vscode
 PRODUCTDIR=/opt/$PRODUCT
 
 # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
@@ -17,11 +18,9 @@ move_to_opt
 subst '1iAutoReq:yes,nomonolib,nomono' $SPEC
 subst '1iAutoProv:no' $SPEC
 
-subst "s|\(.*$PRODUCTDIR/code.*\)|/usr/bin/code\n/usr/bin/vscode\n\1|" $SPEC
-subst "s|/usr/share/code/code|$PRODUCTDIR/bin/code|g" $BUILDROOT/usr/share/applications/$PRODUCT.desktop
-chmod 0644 $BUILDROOT/usr/share/applications/$PRODUCT.desktop
+fix_desktop_file /usr/share/code/code
 
-mkdir -p $BUILDROOT/usr/bin/
-ln -rsf $BUILDROOT$PRODUCTDIR/bin/code $BUILDROOT/usr/bin/code
-ln -rs $BUILDROOT$PRODUCTDIR/bin/code $BUILDROOT/usr/bin/vscode
+rm $BUILDROOT/usr/bin/code
+add_bin_link_command $PRODUCT $PRODUCTDIR/bin/code
+add_bin_link_command $PRODUCTCUR $PRODUCTDIR/bin/code
 

repack.d/common.sh

@@ -256,6 +256,7 @@ fix_desktop_file()
     [ -n "$from" ] || from="$PRODUCTDIR/$PRODUCT"
     [ -n "$to" ] || to="$(basename "$from")"
     subst "s|$from|$to|" $BUILDROOT/usr/share/applications/*.desktop
+    chmod -v 0644 $BUILDROOT/usr/share/applications/*.desktop
 }
 
 fix_chrome_sandbox()

repack.d/discord.sh

@@ -5,6 +5,7 @@ BUILDROOT="$1"
 SPEC="$2"
 
 PRODUCT=discord
+PRODUCTCUR=Discord
 PRODUCTDIR=/opt/$PRODUCT
 
 . $(dirname $0)/common-chromium-browser.sh
@@ -19,7 +20,8 @@ subst '1iAutoProv:no' $SPEC
 
 mkdir -p $BUILDROOT/usr/bin/
 ln -sf $PRODUCTDIR/Discord $BUILDROOT/usr/bin/$PRODUCT
-subst "s|/usr/share/discord/Discord|/usr/bin/$PRODUCT|g" $BUILDROOT/$PRODUCTDIR/discord.desktop
 ln -sf $PRODUCTDIR/discord.desktop $BUILDROOT/usr/share/applications/discord.desktop
 ln -sf $PRODUCTDIR/discord.png $BUILDROOT/usr/share/pixmaps/discord.png
 
+fix_desktop_file /usr/share/discord/Discord $PRODUCT
+

repack.d/draw.io.sh

@@ -13,4 +13,6 @@ PRODUCTDIR=/opt/drawio
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
+fix_desktop_file /opt/drawio/drawio
+
 fix_chrome_sandbox

repack.d/gitkraken.sh

@@ -18,6 +18,7 @@ move_to_opt
 fix_chrome_sandbox
 
 fix_desktop_file /usr/share/gitkraken/gitkraken
+fix_desktop_file /usr/bin/gitkraken
 
 add_findreq_skiplist "$PRODUCTDIR/resources/app.asar.unpacked/node_modules/@axosoft/*/build/Release/*.node"
 add_findreq_skiplist "$PRODUCTDIR/resources/app.asar.unpacked/node_modules/@msgpackr-extract/msgpackr-extract-linux-x64/*.node"

repack.d/google-chrome-stable.sh

@@ -25,6 +25,7 @@ subst 's|Name=Google Chrome|Name=Google Chrome Web Browser\nName[ru]=Веб-бр
 subst 's|GenericName=Web Browser|GenericName=Google Chrome Web Browser|' $BUILDROOT/usr/share/applications/*.desktop
 subst 's|GenericName\[ru\]=Веб-браузер|GenericName[ru]=Веб-браузер Google Chrome|' $BUILDROOT/usr/share/applications/*.desktop
 
+fix_desktop_file /usr/bin/google-chrome-stable
 
 install_deps
 

repack.d/lunacy.sh

@@ -15,8 +15,8 @@ PREINSTALL_PACKAGES="liblttng-ust libX11 fontconfig zlib"
 add_bin_link_command $PRODUCTCUR
 add_bin_link_command $PRODUCT $PRODUCTCUR
 
-fix_desktop_file
-fix_desktop_file /opt/icons8/lunacy/Assets/LunacyLogo.png $PRODUCT.png
+fix_desktop_file /opt/icons8/lunacy/Lunacy $PRODUCT
+fix_desktop_file /opt/icons8/lunacy/Assets/LunacyLogo.png $PRODUCT
 install_file /opt/icons8/lunacy/Assets/LunacyLogo.png /usr/share/pixmaps/$PRODUCT.png
 
 subst '1iAutoProv:no' $SPEC

repack.d/master-pdf-editor.sh

@@ -14,3 +14,4 @@ PREINSTALL_PACKAGES="libGL libqt5-core libqt5-gui libqt5-network libqt5-printsup
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
+fix_desktop_file

repack.d/microsoft-edge-stable.sh

@@ -29,6 +29,8 @@ use_system_xdg
 
 install_deps
 
+fix_desktop_file /usr/bin/$PRODUCTCUR
+
 #if ! grep -q '^"/usr/bin/microsoft-edge"' $SPEC ; then
 #    subst 's|\(.*/usr/bin/microsoft-edge-stable.*\)|"/usr/bin/microsoft-edge"\n\1|' $SPEC
 #fi

repack.d/obsidian.sh

@@ -22,6 +22,8 @@ install_deps
 
 fix_chrome_sandbox
 
+fix_desktop_file
+
 #epm assure patchelf || exit
 #for i in $BUILDROOT$PRODUCTDIR/$PRODUCT ; do
 #    a= patchelf --set-rpath "$PRODUCTDIR" $i

repack.d/onlyoffice-desktopeditors.sh

@@ -45,3 +45,4 @@ subst "s|%files|%files\n/usr/share/icons/hicolor/*x*/apps/$iconname.png|" $SPEC
 subst '1iAutoReq:no' $SPEC
 subst '1iAutoProv:no' $SPEC
 
+fix_desktop_file /usr/bin/onlyoffice-desktopeditors

repack.d/sferum.sh

@@ -15,3 +15,5 @@ add_bin_exec_command $PRODUCTCUR
 add_bin_exec_command $PRODUCT $PRODUCTDIR/$PRODUCTCUR
 
 fix_chrome_sandbox
+
+fix_desktop_file /opt/Sferum/sferum

repack.d/skypeforlinux.sh

@@ -5,6 +5,7 @@ BUILDROOT="$1"
 SPEC="$2"
 
 PRODUCT=skype
+PRODUCTCUR=skypeforlinux
 PRODUCTDIR=/opt/skype
 
 . $(dirname $0)/common-chromium-browser.sh
@@ -27,3 +28,5 @@ ln -s /usr/bin/skypeforlinux $BUILDROOT/usr/bin/skype
 subst 's|%files|%files\n/usr/bin/skype|' $SPEC
 
 fix_chrome_sandbox
+
+fix_desktop_file /usr/bin/skypeforlinux

repack.d/tamtam-app.sh

@@ -16,3 +16,5 @@ add_bin_exec_command $PRODUCT
 add_bin_exec_command $PRODUCTCUR $PRODUCTDIR/$PRODUCT
 
 fix_chrome_sandbox
+
+fix_desktop_file /opt/TamTam/tamtam

repack.d/teams.sh

@@ -29,3 +29,5 @@ subst '1iAutoProv:no' $SPEC
 drop_embedded_reqs
 
 fix_chrome_sandbox
+
+fix_desktop_file /usr/bin/teams

repack.d/vivaldi-snapshot.sh

@@ -21,6 +21,8 @@ add_bin_commands
 
 use_system_xdg
 
+fix_desktop_file /usr/bin/$PRODUCTCUR
+
 install_deps
 
 add_findreq_skiplist $PRODUCTDIR/update-ffmpeg

repack.d/vivaldi-stable.sh

@@ -21,6 +21,8 @@ add_bin_commands
 
 use_system_xdg
 
+fix_desktop_file /usr/bin/$PRODUCTCUR
+
 install_deps
 
 add_findreq_skiplist $PRODUCTDIR/update-ffmpeg

repack.d/yandex-browser-beta.sh

@@ -30,3 +30,4 @@ use_system_xdg
 
 install_deps
 
+fix_desktop_file /usr/bin/$PRODUCTCUR

repack.d/yandex-browser-stable.sh

@@ -30,3 +30,4 @@ use_system_xdg
 
 install_deps
 
+fix_desktop_file /usr/bin/$PRODUCTCUR

repack.d/zoom.sh

@@ -93,3 +93,4 @@ install_deps
 
 fix_chrome_sandbox $PRODUCTDIR/cef/chrome-sandbox
 
+fix_desktop_file /usr/bin/zoom