more strong distro versions

bin/epm-release_downgrade

@@ -37,10 +37,12 @@ get_prev_release()
 		echo "c8" ;;
 	"c8.2")
 		echo "c8.1" ;;
-	"c9")
-		echo "c8.2" ;;
-	"9")
-		echo "10" ;;
+	"c9f1")
+		echo "c8" ;;
+	"c9f2")
+		echo "c9f1" ;;
+	"10")
+		echo "9" ;;
 	*)
 		echo "$FROM" ;;
 	esac

bin/epm-release_upgrade

@@ -253,8 +253,10 @@ get_next_release()
 		echo "c8.1" ;;
 	"c8.1")
 		echo "c8.2" ;;
-	"c8.2")
-		echo "c9" ;;
+	"c8")
+		echo "c9f2" ;;
+	"c9f1")
+		echo "c9f2" ;;
 	*)
 		echo "$FROM" ;;
 	esac
@@ -321,7 +323,7 @@ __switch_alt_to_distro()
 			__check_system "$TO"
 			docmd epm update-kernel || fatal
 			;;
-		"p8"|"p8 p9"|"t8 p9"|"c8 c9"|"c8 p9"|"c8.1 p9"|"c8.2 p9"|"p9 p9"|"p9 c9")
+		"p8"|"p8 p9"|"t8 p9"|"c8 c9"|"c8 p9"|"c8.1 p9"|"c8.2 p9"|"p9 p9"|"p9 c9f2")
 			confirm_info "Upgrade $DISTRNAME from $FROM to $TO ..."
 			docmd epm install rpm apt "$(get_fix_release_pkg "$FROM")" || fatal
 			info "Workaround for https://bugzilla.altlinux.org/show_bug.cgi?id=35492 ..."
@@ -386,7 +388,7 @@ __switch_alt_to_distro()
 			__check_system "$TO"
 			docmd epm upgrade || fatal
 			;;
-		"Sisyphus p8"|"Sisyphus p9"|"Sisyphus p10"|"Sisyphus c8"|"Sisyphus c8.1"|"Sisyphus c9")
+		"Sisyphus p8"|"Sisyphus p9"|"Sisyphus p10"|"Sisyphus c8"|"Sisyphus c8.1"|"Sisyphus c9f2")
 			confirm_info "Downgrade $DISTRNAME from $FROM to $TO ..."
 			docmd epm install "$(get_fix_release_pkg "$FROM")"
 			__switch_repo_to $TO

bin/epm-repofix

@@ -46,10 +46,10 @@ __repofix_filter_vendor()
 	local br="$1"
 	br="$(echo "$br" | sed -e "s|\..*||")"
 	case $br in
-		c8)
+		c8*)
 			br="cert8"
 			;;
-		c9)
+		c9*)
 			br="cert9"
 			;;
 		Sisyphus)

tests/etc/ALTMED/etalon.txt

+ALTLinux/p8

tests/etc/ALTSP8.4/etalon.txt

+ALTLinux/c9f2

tests/etc/ALTServer/etalon.txt

+ALTServer/10

tests/etc/ALTWorkstation/etalon.txt

+ALTLinux/p10

tests/etc/AstraLinuxCE/etalon.txt

+AstraLinux/2.12

tests/etc/AstraLinuxCE2/etalon.txt

+AstraLinux/2.12.44

tests/etc/AstraLinuxSE/etalon.txt

+AstraLinux/1.7

tests/etc/AstraLinuxSE/etc/os-release

+PRETTY_NAME="Astra Linux"
+NAME="Astra Linux"
+ID=astra
+ID_LIKE=debian
+ANSI_COLOR="1;31"
+HOME_URL="https://astralinux.ru"
+SUPPORT_URL="https://astralinux.ru/support"
+LOGO=astra
+VERSION_ID=1.7_x86-64
+VERSION_CODENAME=1.7_x86-64

tests/etc/MESh/etalon.txt

+MESh/10

tests/etc/Manjaro/etalon.txt

+ManjaroLinux/CUR

tests/etc/RHEL/etalon.txt

+RHEL/7.9

tests/etc/ROSA/etalon.txt

+RELS/7.9

tests/etc/ROSA12/etalon.txt

+ROSA/2021.1

tests/etc/altlinux-release

-ALT Workstation K 9.0 BETA (Centaurea Ruthenica)

tests/etc/openSUSE/etalon.txt

+openSUSE Tumbleweed/20161014

tests/test_distr_info.sh

+#!/bin/sh
+
+WRITE=''
+[ "$1" = "--write" ] && WRITE=1
+
+for ROOTDIR in $(ls -1d etc/*) ; do
+    export ROOTDIR
+    e=$(../bin/distr_info -e)
+    if [ -n "$WRITE" ] ; then
+        echo "$e" > $ROOTDIR/etalon.txt
+        continue
+    fi
+    le="$(cat $ROOTDIR/etalon.txt 2>/dev/null)"
+    if [ "$le" = "$e" ] ; then
+        printf "%23s -> %20s : %s\n" "$(basename $ROOTDIR)" "$e" "OK"
+    else
+        printf "%23s -> %20s : %s\n" "$(basename $ROOTDIR)" "$e" "FAIL (expect $le)"
+    fi
+done
+

tests/test_versions.sh

+#!/bin/sh
+
+check()
+{
+    [ "$2" != "$3" ] && echo "FATAL with '$1': result '$3' do not match with '$2'" || echo "OK for '$1' with '$2'"
+}
+
+# 1.2.3.4.5 -> 1
+normalize_version1()
+{
+    echo "$1" | sed -e "s|\..*||"
+}
+
+# 1.2.3.4.5 -> 1.2
+normalize_version2()
+{
+    echo "$1" | sed -e "s|^\([^.][^.]*\.[^.][^.]*\)\..*|\1|"
+}
+
+# 1.2.3.4.5 -> 1.2.3
+normalize_version3()
+{
+    echo "$1" | sed -e "s|^\([^.][^.]*\.[^.][^.]*\.[^.][^.]*\)\..*|\1|"
+}
+
+
+test1()
+{
+    check "$1" "$2" "$(normalize_version1 "$1")"
+}
+
+test2()
+{
+    check "$1" "$2" "$(normalize_version2 "$1")"
+}
+
+test3()
+{
+    check "$1" "$2" "$(normalize_version3 "$1")"
+}
+
+echo
+echo " 1"
+test1 1              1
+test1 10             10
+test1 10.1           10
+test1 10.01          10
+test1 1.1            1
+test1 1.1.1          1
+test1 1.2.3.4        1
+test1 1.2.3.4.5      1
+test1 123            123
+
+echo
+echo " 2"
+test2 2.1            2.1
+test2 2              2
+test2 10             10
+test2 10.1           10.1
+test2 10.01          10.01
+test2 1.1            1.1
+test2 1.1.1          1.1
+test2 1.2.3.4        1.2
+test2 1.2.3.4.5      1.2
+test2 123            123
+
+echo
+echo " 3"
+test3 2.1            2.1
+test3 2              2
+test3 10             10
+test3 10.1           10.1
+test3 10.01          10.01
+test3 1.1            1.1
+test3 1.1.1          1.1.1
+test3 1.2.3.4        1.2.3
+test3 1.2.3.4.5      1.2.3
+test3 1.2.3.4.5.6    1.2.3
+test3 123            123