Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
eepm
Commits
5c84d7df
Commit
5c84d7df
authored
2 years ago
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm pack 1c83-client: fixes
parent
2647945c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
1c83-client.sh
pack.d/1c83-client.sh
+8
-2
1c83-client.sh
repack.d/1c83-client.sh
+3
-2
No files found.
pack.d/1c83-client.sh
View file @
5c84d7df
...
@@ -11,10 +11,12 @@ INSTDIR="/opt/1cv8"
...
@@ -11,10 +11,12 @@ INSTDIR="/opt/1cv8"
VERSION
=
"
$(
echo
$FILENAME
|
sed
's|.*-8|8|'
|
sed
's|-.*||'
)
"
VERSION
=
"
$(
echo
$FILENAME
|
sed
's|.*-8|8|'
|
sed
's|-.*||'
)
"
TARNAME
=
"1c83-client-
$VERSION
.tar"
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
chmod
-v
u+x
$FILENAME
# По умолчанию устанавливается только "client_full,langs,en,ru,advanced". Все остальные компоненты по умолчанию отключены.
# По умолчанию устанавливается только "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
if
echo
"
$FILENAME
"
|
grep
-q
"x86_64.run$"
;
then
arch
=
"x86_64"
arch
=
"x86_64"
...
@@ -26,16 +28,20 @@ fi
...
@@ -26,16 +28,20 @@ fi
# FIXME
# FIXME
UNINSTFILE
=
$INSTDIR
/
$arch
/
$VERSION
/uninstaller-full
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)
# 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"
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?
# FIXME: erc?
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
# Задана тихая деинсталяция.
# Задана тихая деинсталяция.
$SUDO
$UNINSTFILE
--mode
unattended
$SUDO
$UNINSTFILE
--mode
unattended
$SUDO
rm
/opt/.placeholder
return_tar
$TARNAME
return_tar
$TARNAME
This diff is collapsed.
Click to expand it.
repack.d/1c83-client.sh
View file @
5c84d7df
...
@@ -18,6 +18,7 @@ subst "s|^URL:.*|URL: https://1c.ru|" $SPEC
...
@@ -18,6 +18,7 @@ subst "s|^URL:.*|URL: https://1c.ru|" $SPEC
subst
"s|^Summary:.*|Summary: 1C 8.3 Client|"
$SPEC
subst
"s|^Summary:.*|Summary: 1C 8.3 Client|"
$SPEC
subst
'1iAutoProv:no'
$SPEC
subst
'1iAutoProv:no'
$SPEC
subst
'1iAutoReq:no'
$SPEC
#remove_file /usr/local/bin/$PRODUCT
#remove_file /usr/local/bin/$PRODUCT
#add_bin_link_command
#add_bin_link_command
...
@@ -32,7 +33,7 @@ fi
...
@@ -32,7 +33,7 @@ fi
VERSION
=
"
$(
basename
$(
echo
$BUILDROOT
/opt/1cv8/
$arch
/8.3.
*))
"
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
epm assure patchelf
||
exit
...
@@ -44,5 +45,5 @@ for i in $BUILDROOT$PRODUCTDIR/common/lib* ; do
...
@@ -44,5 +45,5 @@ for i in $BUILDROOT$PRODUCTDIR/common/lib* ; do
a
=
patchelf
--set-rpath
'$ORIGIN'
$i
a
=
patchelf
--set-rpath
'$ORIGIN'
$i
done
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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment