Skip to content

epm play 1c: add local package install (eterbug #18280) #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
VanoMajukin wants to merge 1 commit into
base: devel
Choose a base branch
from
Draft

epm play 1c: add local package install (eterbug #18280) #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions pack.d/1c83-client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ FILENAME="$1"
RETURNTARNAME="$2"

. $(dirname $0)/common.sh
. $(dirname $0)/../repack.d/common-1c-enterprise.sh

# unpack if something like server64_8_3_22_1851.tar.gz
if echo "$(basename "$FILENAME")" | grep -q "^server.._8_3.*tar\.gz$" ; then
Expand All @@ -13,11 +14,17 @@ if echo "$(basename "$FILENAME")" | grep -q "^server.._8_3.*tar\.gz$" ; then
FILENAME="$(echo server*/setup-full-8.*.run)"
fi

# with run with setup-full.*.run file
echo "$(basename "$FILENAME")" | grep -q "^setup-full-8\.3.*-.*.run$" || fatal "run with file looks like setup-full-8.3.22.1851-x86_64.run"
# with run with setup-full.*.run or setup-training.*.run file
case "$(basename "$FILENAME")" in
setup-full-8.*-*.run|setup-training-8.*-*.run) ;;
*) fatal "run with file looks like setup-full-8.3.22.1851-x86_64.run or setup-training-8.5.1.1150-x86_64.run" ;;
esac


INSTDIR="/opt/1cv8"
case "$(basename "$FILENAME")" in
setup-training-*) INSTDIR="/opt/1cv8t" ;;
*) INSTDIR="/opt/1cv8" ;;
esac
VERSION="$(echo $FILENAME | sed 's|.*-8|8|' | sed 's|-.*||')"
TARNAME="1c83-client-$VERSION.tar"

Expand All @@ -37,17 +44,30 @@ else
fi

# FIXME
UNINSTFILE=$INSTDIR/$arch/$VERSION/uninstaller-full
[ -x "$UNINSTFILE" ] || fatal "Can't detect executable $UNINSTFILE"
UNINSTFILE=''
for file in "$INSTDIR/$arch/$VERSION"/uninstaller-* "$INSTDIR/$arch/$VERSION"/uninstall* "$INSTDIR"/uninstaller-* "$INSTDIR"/uninstall* ; do
[ -x "$file" ] || continue
UNINSTFILE="$file"
break
done
[ -n "$UNINSTFILE" ] || fatal "Can't detect executable uninstaller in $INSTDIR/$arch/$VERSION"

__1c_enterprise_remove_bundled_runtime_libs_from_root /

# 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"
# icons
ADDFILES="$ADDFILES /usr/share/pixmaps/1c* /usr/share/app-install/icons/1c* /usr/share/icons/hicolor/*/apps/1c*"
ADDFILES="$INSTDIR"
for file in /usr/share/applications/1cv8*$(echo $VERSION| sed -e 's|\.|*|g').desktop \
/usr/share/applications/1cestart*$(echo $VERSION| sed -e 's|\.|*|g').desktop \
/usr/share/pixmaps/1c* \
/usr/share/app-install/icons/1c* \
/usr/share/icons/hicolor/*/apps/1c* ; do
[ -e "$file" ] || continue
ADDFILES="$ADDFILES $file"
done

# FIXME: erc?
epm install --skip-installed tar || fatal
a= tar cf $TARNAME $INSTDIR $ADDFILES
a= tar cf $TARNAME $ADDFILES

esu touch /opt/.placeholder
# Задана тихая деинсталяция.
Expand Down
14 changes: 4 additions & 10 deletions pack.d/1c83-universal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@ FILENAME="$1"
RETURNTARNAME="$2"

. $(dirname $0)/common.sh
. $(dirname $0)/../repack.d/common-1c-enterprise.sh

BASENAME=$(basename "$1" | sed -e 's|\.zip$||')
VERSION=$(echo "$BASENAME" | sed -n 's/.*_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\).*/\1.\2.\3.\4/p')

erc --here unpack "$FILENAME" || fatal
cd $BASENAME

__remove_libstdc(){

rm -f opt/1cv8/x86_64/$VERSION/libstdc++.so.6
rm -f opt/1cv8/x86_64/$VERSION/libgcc_s.so.1
rm -f opt/1cv8/common/libgcc_s.so.1
}

packages_list=$(echo "1c-enterprise*")

for file in $packages_list; do
Expand All @@ -30,7 +24,7 @@ for file in $packages_list; do
case $file in
1c-enterprise-*-server-*)
erc --here unpack "$file" || fatal
__remove_libstdc
__1c_enterprise_remove_bundled_runtime_libs_from_root "$PWD"
erc pack 1c-enterprise-server-$VERSION.tar opt || fatal
rm $file
;;
Expand All @@ -41,7 +35,7 @@ for file in $packages_list; do
mv 1c-enterprise-*-thin-client-*/opt opt
mv 1c-enterprise-*-thin-client-*/usr usr

__remove_libstdc
__1c_enterprise_remove_bundled_runtime_libs_from_root "$PWD"
rm -r $file $(basename $file | sed -e 's|\.rpm||' -e 's|\.deb||')

erc pack 1c-enterprise-thin-client-$VERSION.tar opt usr || fatal
Expand All @@ -54,7 +48,7 @@ for file in $packages_list; do
mv 1c-enterprise-*-client-*/opt opt
mv 1c-enterprise-*-client-*/usr usr

__remove_libstdc
__1c_enterprise_remove_bundled_runtime_libs_from_root "$PWD"
rm -r $file $(basename $file | sed -e 's|\.rpm||' -e 's|\.deb||')

erc pack 1c-enterprise-client-$VERSION.tar opt usr || fatal
Expand Down
Loading
Loading