epm play: fix icons install for JetBrains products

repack.d/CLion.sh

@@ -32,9 +32,8 @@ StartupWMClass=jetbrains-clion
 Categories=Development;IDE
 EOF
 
-mkdir -p $BUILDROOT/usr/share/pixmaps
-install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/
-install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/
+install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/$PRODUCT.png
+install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/$PRODUCT.svg
 
 # kind of hack
 subst 's|%dir "'$PRODUCTDIR'/"||' $SPEC

repack.d/PhpStorm.sh

@@ -32,9 +32,8 @@ StartupWMClass=jetbrains-phpstorm
 Categories=Development;IDE
 EOF
 
-mkdir -p $BUILDROOT/usr/share/pixmaps
-install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/
-install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/
+install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/$PRODUCT.png
+install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/$PRODUCT.svg
 
 # kind of hack
 subst 's|%dir "'$PRODUCTDIR'/"||' $SPEC

repack.d/ideaIC.sh

@@ -20,9 +20,7 @@ move_to_opt "/$PRODUCTCUR-*"
 add_bin_link_command $PRODUCT $PRODUCTDIR/bin/$PRODUCT.sh
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-# create desktop file
-mkdir -p $BUILDROOT/usr/share/applications/
-cat <<EOF >$BUILDROOT/usr/share/applications/$PRODUCT.desktop
+cat <<EOF | create_file /usr/share/applications/$PRODUCT.desktop
 [Desktop Entry]
 Version=1.0
 Type=Application
@@ -36,11 +34,8 @@ StartupWMClass=jetbrains-idea
 Categories=Development;IDE
 EOF
 
-pack_file /usr/share/applications/$PRODUCT.desktop
-
-mkdir -p $BUILDROOT/usr/share/pixmaps
-install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/
-install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/
+install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/$PRODUCT.png
+install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/$PRODUCT.svg
 
 # kind of hack
 subst 's|%dir "'$PRODUCTDIR'/"||' $SPEC

repack.d/pycharm-community.sh

@@ -35,8 +35,8 @@ StartupWMClass=jetbrains-pycharm-ce
 Categories=Development;IDE;Python;
 EOF
 
-install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/
-install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/
+install_file $PRODUCTDIR/bin/$PRODUCT.png /usr/share/pixmaps/$PRODUCT.png
+install_file $PRODUCTDIR/bin/$PRODUCT.svg /usr/share/pixmaps/$PRODUCT.svg
 
 # TODO: support other arch
 for i in arm aarch64 mips64el ppc64le x86 x86-64 ; do