Commit ddc0a086 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm pack 1c83client: use esu instead of SUDO

parent 90c9c6be
...@@ -39,9 +39,6 @@ __epm_pack() ...@@ -39,9 +39,6 @@ __epm_pack()
# a file to keep filename of generated tarball # a file to keep filename of generated tarball
filefortarname="$(pwd)/filefortarname" filefortarname="$(pwd)/filefortarname"
set_sudo
export SUDO
[ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH" [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
local bashopt='' local bashopt=''
[ -n "$verbose" ] && bashopt='-x' [ -n "$verbose" ] && bashopt='-x'
......
...@@ -26,7 +26,7 @@ TARNAME="1c83-client-$VERSION.tar" ...@@ -26,7 +26,7 @@ TARNAME="1c83-client-$VERSION.tar"
chmod -v u+x $FILENAME chmod -v u+x $FILENAME
# По умолчанию устанавливается только "client_full,langs,en,ru,advanced". Все остальные компоненты по умолчанию отключены. # По умолчанию устанавливается только "client_full,langs,en,ru,advanced". Все остальные компоненты по умолчанию отключены.
# Задана тихая установка. # Задана тихая установка.
$SUDO $(realpath $FILENAME) --mode unattended || fatal "Can't install" esu $(realpath $FILENAME) --mode unattended || fatal "Can't install"
if echo "$FILENAME" | grep -q "x86_64.run$" ; then if echo "$FILENAME" | grep -q "x86_64.run$" ; then
arch="x86_64" arch="x86_64"
...@@ -49,9 +49,9 @@ ADDFILES="$ADDFILES /usr/share/pixmaps/1c* /usr/share/app-install/icons/1c* /usr ...@@ -49,9 +49,9 @@ ADDFILES="$ADDFILES /usr/share/pixmaps/1c* /usr/share/app-install/icons/1c* /usr
epm install --skip-installed tar || fatal epm install --skip-installed tar || fatal
a= tar cf $TARNAME $INSTDIR $ADDFILES a= tar cf $TARNAME $INSTDIR $ADDFILES
$SUDO touch /opt/.placeholder esu touch /opt/.placeholder
# Задана тихая деинсталяция. # Задана тихая деинсталяция.
$SUDO $UNINSTFILE --mode unattended esu $UNINSTFILE --mode unattended
$SUDO rm /opt/.placeholder esu rm /opt/.placeholder
return_tar $TARNAME return_tar $TARNAME
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