Commit 291c6068 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: add create_exec_file and use it

parent ba986aa9
...@@ -191,6 +191,13 @@ create_file() ...@@ -191,6 +191,13 @@ create_file()
install_file /dev/stdin $t install_file /dev/stdin $t
} }
create_exec_file()
{
create_file "$1"
chmod a+x "$BUILDROOT/$1"
}
__check_target_bin() __check_target_bin()
{ {
local target="$1" local target="$1"
......
...@@ -16,10 +16,7 @@ fix_chrome_sandbox ...@@ -16,10 +16,7 @@ fix_chrome_sandbox
add_electron_deps add_electron_deps
rm usr/bin/$PRODUCT cat <<EOF | create_exec_file /usr/bin/$PRODUCT
mkdir -p $BUILDROOT/usr/bin
cat <<EOF >$BUILDROOT/usr/bin/$PRODUCT
#!/bin/sh #!/bin/sh
CONFIG_DIR="\$HOME"/.config/discord CONFIG_DIR="\$HOME"/.config/discord
SETTINGS_FILE="\$CONFIG_DIR"/settings.json SETTINGS_FILE="\$CONFIG_DIR"/settings.json
...@@ -40,8 +37,6 @@ if [ ! -f "\$SETTINGS_FILE" ]; then ...@@ -40,8 +37,6 @@ if [ ! -f "\$SETTINGS_FILE" ]; then
fi fi
exec $PRODUCTDIR/$PRODUCTCUR \$EXTRA_PARAMS "\$@" exec $PRODUCTDIR/$PRODUCTCUR \$EXTRA_PARAMS "\$@"
EOF EOF
chmod a+x $BUILDROOT/usr/bin/$PRODUCT
pack_file /usr/bin/$PRODUCT
add_bin_link_command $PRODUCTCUR $PRODUCT add_bin_link_command $PRODUCTCUR $PRODUCT
rm usr/share/applications/discord.desktop rm usr/share/applications/discord.desktop
......
...@@ -10,14 +10,10 @@ PREINSTALL_PACKAGES="coreutils libgdiplus liblame libnuma libopus libuuid libvor ...@@ -10,14 +10,10 @@ PREINSTALL_PACKAGES="coreutils libgdiplus liblame libnuma libopus libuuid libvor
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
mkdir -p $BUILDROOT/usr/bin/ cat <<EOF | create_exec_file /usr/bin/$PRODUCT
cat <<EOF >$BUILDROOT/usr/bin/$PRODUCT
#!/bin/sh #!/bin/sh
mono /opt/iproject-client/RSClient.exe mono /opt/iproject-client/RSClient.exe
EOF EOF
chmod 755 $BUILDROOT/usr/bin/$PRODUCT
pack_file /usr/bin/$PRODUCT
# mono(Microsoft.Threading.Tasks) = 1.0.12.0 нужен для iproject-client-100:2.0.11.128-alt1.repacked.with.epm.2.x86_64 # mono(Microsoft.Threading.Tasks) = 1.0.12.0 нужен для iproject-client-100:2.0.11.128-alt1.repacked.with.epm.2.x86_64
# mono(Microsoft.Threading.Tasks.Extensions) = 1.0.12.0 нужен для iproject-client-100:2.0.11.128-alt1.repacked.with.epm.2.x86_64 # mono(Microsoft.Threading.Tasks.Extensions) = 1.0.12.0 нужен для iproject-client-100:2.0.11.128-alt1.repacked.with.epm.2.x86_64
......
...@@ -15,11 +15,10 @@ remove_file $PRODUCTDIR/portmaster.desktop ...@@ -15,11 +15,10 @@ remove_file $PRODUCTDIR/portmaster.desktop
install -D -m644 .$PRODUCTDIR/portmaster_notifier.desktop ./usr/share/applications/portmaster_notifier.desktop install -D -m644 .$PRODUCTDIR/portmaster_notifier.desktop ./usr/share/applications/portmaster_notifier.desktop
remove_file $PRODUCTDIR/portmaster_notifier.desktop remove_file $PRODUCTDIR/portmaster_notifier.desktop
cat <<EOF | create_file /usr/bin/$PRODUCT cat <<EOF | create_exec_file /usr/bin/$PRODUCT
#!/bin/sh #!/bin/sh
exec $PRODUCTDIR/portmaster-start app --data=$PRODUCTDIR "\$@" exec $PRODUCTDIR/portmaster-start app --data=$PRODUCTDIR "\$@"
EOF EOF
chmod a+x $BUILDROOT/usr/bin/$PRODUCT
echo "Dowloading ... " echo "Dowloading ... "
.$PRODUCTDIR/portmaster-start --data $BUILDROOT$PRODUCTDIR update || fatal .$PRODUCTDIR/portmaster-start --data $BUILDROOT$PRODUCTDIR update || fatal
......
...@@ -27,8 +27,7 @@ remove_file /usr/bin/rudesktop ...@@ -27,8 +27,7 @@ remove_file /usr/bin/rudesktop
move_to_opt /usr/share/rudesktop-client/files move_to_opt /usr/share/rudesktop-client/files
mkdir -p $BUILDROOT/usr/bin cat <<EOF | create_exec_file /usr/bin/rudesktop
cat <<EOF >$BUILDROOT/usr/bin/rudesktop
#!/bin/sh #!/bin/sh
cd /opt/rudesktop cd /opt/rudesktop
if [ "\$LD_LIBRARY_PATH" ]; then if [ "\$LD_LIBRARY_PATH" ]; then
...@@ -38,9 +37,8 @@ else ...@@ -38,9 +37,8 @@ else
fi fi
./rudesktop ./rudesktop
EOF EOF
chmod a+x $BUILDROOT/usr/bin/rudesktop
chmod a+x $BUILDROOT/opt/rudesktop/rudesktop chmod a+x $BUILDROOT/opt/rudesktop/rudesktop
pack_file /usr/bin/rudesktop
subst "s|^Summary:.*|Summary: A remote control software.|" $SPEC subst "s|^Summary:.*|Summary: A remote control software.|" $SPEC
......
...@@ -32,14 +32,12 @@ pack_dir $PRODUCTDIR/bin ...@@ -32,14 +32,12 @@ pack_dir $PRODUCTDIR/bin
#done #done
#fi #fi
mkdir -p $BUILDROOT/usr/bin cat <<EOF | create_exec_file /usr/bin/heaven
cat <<EOF | create_file /usr/bin/heaven
#!/bin/sh #!/bin/sh
cd $PRODUCTDIR/bin cd $PRODUCTDIR/bin
export LD_LIBRARY_PATH=./x64:\$LD_LIBRARY_PATH export LD_LIBRARY_PATH=./x64:\$LD_LIBRARY_PATH
./browser_x64 -config ../data/launcher/launcher.xml ./browser_x64 -config ../data/launcher/launcher.xml
EOF EOF
chmod a+x $BUILDROOT/usr/bin/heaven
add_bin_link_command $PRODUCT /usr/bin/heaven add_bin_link_command $PRODUCT /usr/bin/heaven
......
...@@ -26,15 +26,12 @@ done ...@@ -26,15 +26,12 @@ done
pack_dir $PRODUCTDIR pack_dir $PRODUCTDIR
pack_dir $PRODUCTDIR/bin pack_dir $PRODUCTDIR/bin
mkdir -p $BUILDROOT/usr/bin cat <<EOF | create_exec_file /usr/bin/valley
cat <<EOF >$BUILDROOT/usr/bin/valley
#!/bin/sh #!/bin/sh
cd $PRODUCTDIR/bin cd $PRODUCTDIR/bin
export LD_LIBRARY_PATH=./x64:\$LD_LIBRARY_PATH export LD_LIBRARY_PATH=./x64:\$LD_LIBRARY_PATH
./browser_x64 -config ../data/launcher/launcher.xml ./browser_x64 -config ../data/launcher/launcher.xml
EOF EOF
chmod a+x $BUILDROOT/usr/bin/valley
pack_file /usr/bin/valley
add_bin_link_command $PRODUCT /usr/bin/valley add_bin_link_command $PRODUCT /usr/bin/valley
......
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