change AstraLinux to AstraLinuxCE/SE

bin/distr_info

@@ -62,7 +62,8 @@ pkgvendor()
 {
 	[ "$DISTRIB_ID" = "ALTLinux" ] && echo "alt" && return
 	[ "$DISTRIB_ID" = "ALTServer" ] && echo "alt" && return
-	[ "$DISTRIB_ID" = "AstraLinux" ] && echo "astra" && return
+	[ "$DISTRIB_ID" = "AstraLinuxSE" ] && echo "astra" && return
+	[ "$DISTRIB_ID" = "AstraLinuxCE" ] && echo "astra" && return
 	[ "$DISTRIB_ID" = "LinuxXP" ] && echo "lxp" && return
 	[ "$DISTRIB_ID" = "TinyCoreLinux" ] && echo "tcl" && return
 	[ "$DISTRIB_ID" = "VoidLinux" ] && echo "void" && return
@@ -97,7 +98,7 @@ case $DISTRIB_ID in
 	PCLinux)
 		CMD="apt-rpm"
 		;;
-	Ubuntu|Debian|Mint|AstraLinux|Elbrus)
+	Ubuntu|Debian|Mint|AstraLinux*|Elbrus)
 		CMD="apt-dpkg"
 		#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
 		#hascommand snappy && CMD=snappy
@@ -329,6 +330,7 @@ case "$VENDOR_ID" in
 		;;
 	"astra")
 		DISTRIB_RELEASE=$(normalize_version3 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||')
+		[ "$VARIANT" = "orel" ] && DISTRIB_ID="AstraLinuxCE" || DISTRIB_ID="AstraLinuxSE"
 		#[ "$DISTRIB_RELEASE" = "1.17" ] && DISTRIB_RELEASE="$VERSION_ID"
 		#DISTRIB_RELEASE="$VERSION_CODENAME"
 		;;

bin/epm-addrepo

@@ -221,7 +221,7 @@ __epm_addrepo_deb()
 		return
 	fi
 
-	if [ "$DISTRNAME" = "AstraLinux" ] ; then
+	if [ "$DISTRNAME" = "AstraLinuxCE" ] || [ "$DISTRNAME" = "AstraLinuxSE" ] ; then; then
 		echo "Use workaround for AstraLinux"
 		# aptsources.distro.NoDistroTemplateException: Error: could not find a distribution template for AstraLinuxCE/orel
 		echo "" | sudocmd tee -a /etc/apt/sources.list

bin/epm-removerepo

@@ -105,7 +105,7 @@ case $PMTYPE in
 		assure_exists apt-add-repository software-properties-common
 		set_sudo
 
-		if [ "$DISTRNAME" = "AstraLinux" ] ; then
+		if [ "$DISTRNAME" = "AstraLinuxCE" ] || [ "$DISTRNAME" = "AstraLinuxSE" ] ; then
 			echo "Use workaround for AstraLinux"
 			[ -n "$*" ] || fatal "empty repo name"
 			# aptsources.distro.NoDistroTemplateException: Error: could not find a distribution template for AstraLinuxCE/orel

bin/serv

@@ -56,7 +56,7 @@ case $DISTRNAME in
 	ALTLinux|ALTServer)
 		CMD="service-chkconfig"
 		;;
-	Ubuntu|Debian|Mint|AstraLinux)
+	Ubuntu|Debian|Mint|AstraLinux*)
 		CMD="service-update"
 		;;
 	Mandriva|ROSA)

play.d/mssql-server.sh

@@ -22,7 +22,7 @@ dname="$(epm print info -s)"
 dversion="$(epm print info -v)"
 
 case "$($DISTRVENDOR -d)" in
-  "AstraLinux")
+  AstraLinux*)
     # we have libc++1-9, but this package requires libc++1
     epm ar $DEBREPO ; epm update
     epm install libc++1

play.d/mssql-tools.sh

@@ -15,7 +15,7 @@ dname="$(epm print info -s)"
 dversion="$(epm print info -v)"
 
 case "$($DISTRVENDOR -d)" in
-  "AstraLinux")
+  AstraLinux*)
     epm install --skip-installed unixodbc || fatal
     epm install https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17/msodbcsql17_1*_amd64.deb
     epm install https://packages.microsoft.com/debian/8/prod/pool/main/m/mssql-tools/mssql-tools_1*_amd64.deb

play.d/okular-csp.sh

@@ -25,8 +25,7 @@ esac
 case $(epm print info -e) in
     Debian/11|Ubuntu/20.04)
         ;;
-#     AstraLinuxSE/1.7*)
-    AstraLinux/smolensk)
+    AstraLinuxSE/1.7*)
         ;;
     Fedora/35|ROSA/2021|RedOS/7)
         ;;
@@ -49,14 +48,13 @@ pkgsystem=$(epm print info -g)
 
 case $(epm print info -e) in
 # TODO:
-    AstraLinux/orel)
+    AstraLinuxCE*)
         pkgsystem=''
         epm repo addkey "$REPOURL/lab50.gpg"
         epm repo add "deb $REPOURL/ce stable main"
         ;;
 # TODO:
-#     AstraLinuxSE/1.7*)
-    AstraLinux/smolensk)
+    AstraLinuxSE*)
         distrib=alse17
         additional_packages="libkf5js5=5.78.0-0ubuntu2+alse17 libkf5jsapi5=5.78.0-0ubuntu2+alse17"
         ;;

play.d/rudesktop.sh

@@ -7,7 +7,7 @@ DESCRIPTION="RuDesktop for Linux from the official site"
 . $(dirname $0)/common.sh
 
 case "$($DISTRVENDOR -d)" in
-  "AstraLinux")
+  AstraLinux*)
       PKGNAME=rudesktop-astra
       ;;
 esac

play.d/sputnik-browser.sh

@@ -36,12 +36,9 @@ case "$($DISTRVENDOR -e)" in
     ALTLinux/*|ALTServer/*)
         id_content='alt9-id'
         ;;
-    AstraLinux/smolensk)
+    AstraLinux*)
         id_content='astrase-id'
         ;;
-    AstraLinux/*)
-        id_content='astrace-id'
-        ;;
     RedOS/*)
         id_content='redos-id'
         ;;