Commit b583f6b7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: fix add_bin_link_command using

parent cbb25894
...@@ -103,6 +103,6 @@ add_bin_commands() ...@@ -103,6 +103,6 @@ add_bin_commands()
fi fi
# short command for run # short command for run
[ "$PRODUCT" = "$PRODUCTDIR" ] || add_bin_link_command $PRODUCT $PRODUCTCUR add_bin_link_command $PRODUCT $PRODUCTCUR
} }
...@@ -108,6 +108,7 @@ add_bin_link_command() ...@@ -108,6 +108,7 @@ add_bin_link_command()
[ -n "$name" ] || name="$PRODUCT" [ -n "$name" ] || name="$PRODUCT"
[ -n "$target" ] || target="$PRODUCTDIR/$name" [ -n "$target" ] || target="$PRODUCTDIR/$name"
[ -e "$BUILDROOT/usr/bin/$name" ] && return [ -e "$BUILDROOT/usr/bin/$name" ] && return
[ "$name" = "$target" ] && return
mkdir -p $BUILDROOT/usr/bin/ mkdir -p $BUILDROOT/usr/bin/
ln -s "$target" "$BUILDROOT/usr/bin/$name" || return ln -s "$target" "$BUILDROOT/usr/bin/$name" || return
...@@ -122,6 +123,7 @@ add_bin_exec_command() ...@@ -122,6 +123,7 @@ add_bin_exec_command()
[ -n "$name" ] || name="$PRODUCT" [ -n "$name" ] || name="$PRODUCT"
[ -n "$target" ] || target="$PRODUCTDIR/$name" [ -n "$target" ] || target="$PRODUCTDIR/$name"
[ -e "$BUILDROOT/usr/bin/$name" ] && return [ -e "$BUILDROOT/usr/bin/$name" ] && return
[ "$name" = "$target" ] && return
mkdir -p $BUILDROOT/usr/bin/ mkdir -p $BUILDROOT/usr/bin/
cat <<EOF > "$BUILDROOT/usr/bin/$name" cat <<EOF > "$BUILDROOT/usr/bin/$name"
...@@ -165,7 +167,6 @@ move_to_opt() ...@@ -165,7 +167,6 @@ move_to_opt()
subst "s|$rdir|$PRODUCTDIR|g" $SPEC subst "s|$rdir|$PRODUCTDIR|g" $SPEC
} }
fix_chrome_sandbox() fix_chrome_sandbox()
{ {
local sandbox="$1" local sandbox="$1"
......
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
BUILDROOT="$1" BUILDROOT="$1"
SPEC="$2" SPEC="$2"
PRODUCT=draw.io PRODUCT=drawio
PRODUCTDIR=/opt/drawio/ PRODUCTCUR=draw.io
PRODUCTDIR=/opt/drawio
. $(dirname $0)/common-chromium-browser.sh . $(dirname $0)/common-chromium-browser.sh
add_bin_link_command drawio add_bin_link_command
add_bin_link_command $PRODUCT $PRODUCTDIR/drawio add_bin_link_command $PRODUCTCUR $PRODUCT
fix_chrome_sandbox fix_chrome_sandbox
...@@ -3,11 +3,13 @@ ...@@ -3,11 +3,13 @@
BUILDROOT="$1" BUILDROOT="$1"
SPEC="$2" SPEC="$2"
PRODUCT=master-pdf-editor PRODUCT=masterpdfeditor5
PRODUCTCUR=master-pdf-editor
PRODUCTDIR=/opt/master-pdf-editor-5 PRODUCTDIR=/opt/master-pdf-editor-5
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
add_bin_link_command masterpdfeditor5 add_bin_link_command
add_bin_link_command $PRODUCTCUR $PRODUCT
epm install --skip-installed libGL libqt5-core libqt5-gui libqt5-network libqt5-printsupport libqt5-qml libqt5-svg libqt5-widgets libsane zlib epm install --skip-installed libGL libqt5-core libqt5-gui libqt5-network libqt5-printsupport libqt5-qml libqt5-svg libqt5-widgets libsane zlib
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
BUILDROOT="$1" BUILDROOT="$1"
SPEC="$2" SPEC="$2"
PRODUCT=rocketchat PRODUCT=rocketchat-desktop
PRODUCTCUR=rocketchat-desktop PRODUCTCUR=rocketchat
PRODUCTDIR=/opt/Rocket.Chat PRODUCTDIR=/opt/Rocket.Chat
. $(dirname $0)/common-chromium-browser.sh . $(dirname $0)/common-chromium-browser.sh
add_bin_link_command $PRODUCTCUR $PRODUCTDIR/$PRODUCTCUR add_bin_link_command
add_bin_link_command $PRODUCT $PRODUCTCUR add_bin_link_command $PRODUCTCUR $PRODUCT
install_deps install_deps
......
...@@ -9,7 +9,8 @@ PRODUCTDIR=/opt/VinteoDesktop ...@@ -9,7 +9,8 @@ PRODUCTDIR=/opt/VinteoDesktop
. $(dirname $0)/common-chromium-browser.sh . $(dirname $0)/common-chromium-browser.sh
add_bin_link_command vinteo.desktop add_bin_link_command
subst 's|/opt/VinteoDesktop/||' $BUILDROOT/usr/share/applications/vinteo.desktop.desktop subst 's|/opt/VinteoDesktop/||' $BUILDROOT/usr/share/applications/vinteo.desktop.desktop
fix_chrome_sandbox fix_chrome_sandbox
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment