From 25e54fe85190481f3a48e6afcc871903379fda74 Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov <lav@etersoft.ru> Date: Fri, 24 Mar 2023 22:52:44 +0300 Subject: [PATCH] epm repack: improve application dir packing --- repack.d/64Gram.sh | 1 + repack.d/common.sh | 2 ++ repack.d/domination-client.sh | 2 ++ repack.d/mssql-server.sh | 1 + repack.d/vkteams.sh | 1 + 5 files changed, 7 insertions(+) diff --git a/repack.d/64Gram.sh b/repack.d/64Gram.sh index b7274328..d181dd4c 100755 --- a/repack.d/64Gram.sh +++ b/repack.d/64Gram.sh @@ -29,6 +29,7 @@ else subst "s|^\"/|\"$PRODUCTDIR/|" $SPEC fi +pack_dir $PRODUCTDIR move_file $PRODUCTDIR/Telegram $PRODUCTDIR/$PRODUCT add_bin_link_command diff --git a/repack.d/common.sh b/repack.d/common.sh index a16f1877..582fb2ce 100755 --- a/repack.d/common.sh +++ b/repack.d/common.sh @@ -206,6 +206,8 @@ move_to_opt() subst "s|\(%config.*\) \"$rdir|\1 \"$PRODUCTDIR|" $SPEC subst "s|^$rdir|$PRODUCTDIR|" $SPEC subst "s|^\"$rdir|\"$PRODUCTDIR|" $SPEC + + pack_dir "$PRODUCTDIR" } # remove absolute path from desktop file diff --git a/repack.d/domination-client.sh b/repack.d/domination-client.sh index 6df784ab..89564697 100755 --- a/repack.d/domination-client.sh +++ b/repack.d/domination-client.sh @@ -12,6 +12,8 @@ PRODUCTDIR="/opt/Domination/Client" move_to_opt "/opt/Domination Client" subst "s|/opt/Domination Client/||" $BUILDROOT/usr/share/applications/domination-client.desktop +pack_dir $PRODUCTDIR + add_bin_link_command install_deps diff --git a/repack.d/mssql-server.sh b/repack.d/mssql-server.sh index 636dfdd7..9d4055ea 100755 --- a/repack.d/mssql-server.sh +++ b/repack.d/mssql-server.sh @@ -3,6 +3,7 @@ # It will be run with two args: buildroot spec BUILDROOT="$1" SPEC="$2" +PRODUCTDIR=/opt/mssql . $(dirname $0)/common.sh diff --git a/repack.d/vkteams.sh b/repack.d/vkteams.sh index 459e3b61..e9f7d85d 100755 --- a/repack.d/vkteams.sh +++ b/repack.d/vkteams.sh @@ -16,6 +16,7 @@ subst "s|^Summary:.*|Summary: VK Teams|" $SPEC mkdir -p $BUILDROOT$PRODUCTDIR mv $BUILDROOT/* $BUILDROOT$PRODUCTDIR subst "s|\"/|\"$PRODUCTDIR/|" $SPEC +pack_dir $PRODUCTDIR add_bin_exec_command $PRODUCT # Hack against https://bugzilla.altlinux.org/43779 -- 2.24.1