epm pack 1c83-client: fixes

pack.d/1c83-client.sh

@@ -11,10 +11,12 @@ INSTDIR="/opt/1cv8"
 VERSION="$(echo $FILENAME | sed 's|.*-8|8|' | sed 's|-.*||')"
 TARNAME="1c83-client-$VERSION.tar"
 
+[ -d "$INSTDIR" ] && fatal "Don't use the script if you have already installed 1C (or just remove $INSTDIR before)"
+
 chmod -v u+x $FILENAME
 # По умолчанию устанавливается только "client_full,langs,en,ru,advanced". Все остальные компоненты по умолчанию отключены.
 # Задана тихая установка.
-$SUDO $FILENAME --mode unattended || fatal "Can't install"
+$SUDO $(realpath $FILENAME) --mode unattended || fatal "Can't install"
 
 if echo "$FILENAME" | grep -q "x86_64.run$" ; then
     arch="x86_64"
@@ -26,16 +28,20 @@ fi
 
 # FIXME
 UNINSTFILE=$INSTDIR/$arch/$VERSION/uninstaller-full
-[ -s "$UNINSTFILE" ] || fatal "Can't detect $UNINSTFILE"
+[ -x "$UNINSTFILE" ] || fatal "Can't detect executable $UNINSTFILE"
 
 # 8.3.22.1851 -> 8*3*22*1851 (they use - in 1cv8-8.3.22-1851.desktop)
 ADDFILES="/usr/share/applications/1cv8*$(echo $VERSION| sed -e 's|\.|*|g').desktop"
+# icons
+ADDFILES="$ADDFILES /usr/share/pixmaps/1c* /usr/share/app-install/icons/1c* /usr/share/icons/hicolor/*/apps/1c*"
 
 # FIXME: erc?
 epm install --skip-installed tar || fatal
 a= tar cf $TARNAME $INSTDIR $ADDFILES
 
+$SUDO touch /opt/.placeholder
 # Задана тихая деинсталяция.
 $SUDO $UNINSTFILE --mode unattended
+$SUDO rm /opt/.placeholder
 
 return_tar $TARNAME

repack.d/1c83-client.sh

@@ -18,6 +18,7 @@ subst "s|^URL:.*|URL: https://1c.ru|" $SPEC
 subst "s|^Summary:.*|Summary: 1C 8.3 Client|" $SPEC
 
 subst '1iAutoProv:no' $SPEC
+subst '1iAutoReq:no' $SPEC
 
 #remove_file /usr/local/bin/$PRODUCT
 #add_bin_link_command
@@ -32,7 +33,7 @@ fi
 
 VERSION="$(basename $(echo $BUILDROOT/opt/1cv8/$arch/8.3.*))"
 
-remove_dir /opt/1cv8/$arch/$VERSION/ExtDst
+#remove_dir /opt/1cv8/$arch/$VERSION/ExtDst
 
 epm assure patchelf || exit
 
@@ -44,5 +45,5 @@ for i in $BUILDROOT$PRODUCTDIR/common/lib* ; do
     a= patchelf --set-rpath '$ORIGIN' $i
 done
 
-#epm install --skip-installed libmfx || epm install 316139 || fatal "Can't install libmfx"
+epm install --skip-installed glib2 libatk libcairo libcairo-gobject libcom_err libcups libenchant libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+3 libharfbuzz-icu libkrb5 libpango libSM libsoup libunwind libX11 libXcomposite libXdamage libXrender libXt libXxf86vm