commit packed 3.17.1

packed/epm.sh

@@ -3822,7 +3822,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
 fi
 
 
-if [ "$1" = "--remove" ] ; then
+if [ "$1" = "--remove" ] || [ "$1" = "remove" ]  ; then
     shift
     #__check_installed_app "$1" || warning "$1 is not installed"
     prescription="$1"
@@ -3861,19 +3861,19 @@ if [ "$1" = "--update" ] ; then
     exit
 fi
 
-if [ "$1" = "--installed" ] ; then
+if [ "$1" = "--installed" ] || [ "$1" = "installed" ]  ; then
     shift
     __check_installed_app "$1"
     #[ -n "$quiet" ] && exit
     exit
 fi
 
-if [ "$1" = "--list" ] || [ "$1" = "--list-installed" ]  ; then
+if [ "$1" = "--list" ] || [ "$1" = "--list-installed" ] || [ "$1" = "list" ] || [ "$1" = "list-installed" ]  ; then
     __epm_play_list_installed
     exit
 fi
 
-if [ "$1" = "--list-all" ] || [ -z "$*" ] ; then
+if [ "$1" = "--list-all" ] || [ "$1" = "list-all" ] || [ -z "$*" ] ; then
     [ -n "$short" ] || [ -n "$quiet" ] || echo "Available applications:"
     __epm_play_list $psdir
     [ -n "$quiet" ] || [ -n "$*" ] && exit
@@ -3883,7 +3883,7 @@ if [ "$1" = "--list-all" ] || [ -z "$*" ] ; then
     exit
 fi
 
-if [ "$1" = "--list-scripts" ] ; then
+if [ "$1" = "--list-scripts" ] || [ "$1" = "list-scripts" ] ; then
     [ -n "$short" ] || [ -n "$quiet" ] || echo "Run with a name of a play script to run:"
     __epm_play_list $prsdir
     exit
@@ -4308,7 +4308,7 @@ case $PMTYPE in
 		#	CMD="rpm -q --provides"
 		#else
 			EXTRA_SHOWDOCMD=' | grep "Provides:"'
-			docmd apt-cache show $pkg_names | grep "Provides:"
+			docmd apt-cache show $pkg_names | grep "Provides:" | sed -e 's|, |\n|g' | grep -v "^Provides:"
 			return
 		#fi
 		;;
@@ -9023,6 +9023,9 @@ normalize_name()
 		"Fedora Linux")
 			echo "Fedora"
 			;;
+		"RedHatEnterpriseLinuxServer")
+			echo "RHEL"
+			;;
 		*)
 			#echo "${1// /}"
 			echo "$1" | sed -e "s/ //g"
@@ -9061,7 +9064,7 @@ fi
 if distro altlinux-release ; then
 	DISTRIB_ID="ALTLinux"
 	# FIXME: fast hack for fallback: 10 -> p10 for /etc/os-release
-	DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||')"
+	DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||' -e 's|^pp|p|')"
 	if has Sisyphus ; then DISTRIB_RELEASE="Sisyphus"
 	elif has "ALT p10.* p10 " ; then DISTRIB_RELEASE="p10"
 	elif has "ALTServer 10." ; then DISTRIB_RELEASE="p10"
@@ -9155,17 +9158,17 @@ elif distro openwrt_release ; then
 	. $DISTROFILE
 	DISTRIB_RELEASE=$(cat $ROOTDIR/etc/openwrt_version)
 
-elif distro astra_version ; then
-	#DISTRIB_ID=`cat $DISTROFILE | get_var DISTRIB_ID`
-	DISTRIB_ID="AstraLinux"
-	#DISTRIB_RELEASE=$(cat "$DISTROFILE" | head -n1 | sed -e "s|.* \([a-z]*\).*|\1|g")
-	DISTRIB_RELEASE=$DISTRIB_CODENAME
-
 # for Ubuntu use standard LSB info
 elif [ "$DISTRIB_ID" = "Ubuntu" ] && [ -n "$DISTRIB_RELEASE" ]; then
 	# use LSB version
 	true
 
+elif distro astra_version ; then
+	# use OS release
+	DISTRIB_ID="$(echo "$DISTRIB_ID" | sed -e 's|(.*||')"
+	DISTRIB_RELEASE="$VERSION_CODENAME"
+	true
+
 # Debian based
 elif distro debian_version ; then
 	DISTRIB_ID="Debian"
@@ -9358,6 +9361,8 @@ get_debian_arch()
         arch='i386' ;;
     'x86_64')
         arch='amd64' ;;
+    'aarch64')
+        arch='arm64' ;;
     esac
     echo "$arch"
 }
@@ -10521,7 +10526,7 @@ Examples:
 
 print_version()
 {
-        echo "EPM package manager version 3.17.0  https://wiki.etersoft.ru/Epm"
+        echo "EPM package manager version 3.17.1  https://wiki.etersoft.ru/Epm"
         echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
         echo "Copyright (c) Etersoft 2012-2021"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
@@ -10531,7 +10536,7 @@ print_version()
 Usage="Usage: epm [options] <command> [package name(s), package files]..."
 Descr="epm - EPM package manager"
 
-EPMVERSION=3.17.0
+EPMVERSION=3.17.1
 verbose=$EPM_VERBOSE
 quiet=
 nodeps=

packed/serv.sh

@@ -1510,6 +1510,9 @@ normalize_name()
 		"Fedora Linux")
 			echo "Fedora"
 			;;
+		"RedHatEnterpriseLinuxServer")
+			echo "RHEL"
+			;;
 		*)
 			#echo "${1// /}"
 			echo "$1" | sed -e "s/ //g"
@@ -1548,7 +1551,7 @@ fi
 if distro altlinux-release ; then
 	DISTRIB_ID="ALTLinux"
 	# FIXME: fast hack for fallback: 10 -> p10 for /etc/os-release
-	DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||')"
+	DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||' -e 's|^pp|p|')"
 	if has Sisyphus ; then DISTRIB_RELEASE="Sisyphus"
 	elif has "ALT p10.* p10 " ; then DISTRIB_RELEASE="p10"
 	elif has "ALTServer 10." ; then DISTRIB_RELEASE="p10"
@@ -1642,17 +1645,17 @@ elif distro openwrt_release ; then
 	. $DISTROFILE
 	DISTRIB_RELEASE=$(cat $ROOTDIR/etc/openwrt_version)
 
-elif distro astra_version ; then
-	#DISTRIB_ID=`cat $DISTROFILE | get_var DISTRIB_ID`
-	DISTRIB_ID="AstraLinux"
-	#DISTRIB_RELEASE=$(cat "$DISTROFILE" | head -n1 | sed -e "s|.* \([a-z]*\).*|\1|g")
-	DISTRIB_RELEASE=$DISTRIB_CODENAME
-
 # for Ubuntu use standard LSB info
 elif [ "$DISTRIB_ID" = "Ubuntu" ] && [ -n "$DISTRIB_RELEASE" ]; then
 	# use LSB version
 	true
 
+elif distro astra_version ; then
+	# use OS release
+	DISTRIB_ID="$(echo "$DISTRIB_ID" | sed -e 's|(.*||')"
+	DISTRIB_RELEASE="$VERSION_CODENAME"
+	true
+
 # Debian based
 elif distro debian_version ; then
 	DISTRIB_ID="Debian"
@@ -1845,6 +1848,8 @@ get_debian_arch()
         arch='i386' ;;
     'x86_64')
         arch='amd64' ;;
+    'aarch64')
+        arch='arm64' ;;
     esac
     echo "$arch"
 }
@@ -3076,7 +3081,7 @@ print_version()
         local on_text="(host system)"
         local virt="$($DISTRVENDOR -i)"
         [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
-        echo "Service manager version 3.17.0  https://wiki.etersoft.ru/Epm"
+        echo "Service manager version 3.17.1  https://wiki.etersoft.ru/Epm"
         echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
         echo "Copyright (c) Etersoft 2012-2021"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."