backported to p8 as 2.1.8-alt0.M80P.1 (with rpmbph script)

README

@@ -37,6 +37,11 @@ Note: epm is placed as /usr/bin/epm
  $ rpm -qf /usr/bin/epm
 eepm-1.1.0-alt2
 
+== Install on any system ==
+
+Just run under root user:
+# curl -s https://raw.githubusercontent.com/Etersoft/eepm/master/packed/epm.sh | bash /dev/stdin ei --auto
+
 == How to add new distro support ==
 1. Fix detection with distr_info
 2. Add distro support in set_pm_type function

TODO

+systemctl edit юнит
+
 аналог epm purge: запоминаем список файлов, удаляем пакеты и по возможности всё, от чего зависит (рекурсивно).
 
 --interactive
 
 встроить вычисление зависимость сюда rpmreqs
 
+хочется видеть прямые зависимости, обратные, и рекурсивно.
+выводить в цивилизованном виде (в прямом только с --direct)
+
 rsync -av --inplace --progress --compress
 
 epmqp uuid на x86_64/Ubuntu не различает архитектуру

bin/epm

@@ -390,6 +390,10 @@ done
 # if input is not console and run script from file, get pkgs from stdin too
 if ! inputisatty && [ -n "$PROGDIR" ] ; then
     for opt in $(withtimeout 1 cat) ; do
+        # FIXME: do not work
+        # workaround against # yes | epme
+        [ "$opt" = "y" ] && break;
+        [ "$opt" = "yes" ] && break;
         check_filenames $opt
     done
 fi

bin/epm-addrepo

@@ -52,16 +52,16 @@ __epm_addrepo_altlinux()
 			;;
 		archive)
 			datestr="$2"
-			# 2017/12/31
+			echo "$datestr" | grep -Eq "^20[0-2][0-9]/[01][0-9]/[0-3][0-9]$" || fatal "use follow date format: 2017/12/31"
 			# TODO: func?
 			local arch=$(uname -m)
 			[ "$arch" = "i686" ] && arch="i586"
 			echo "" | sudocmd tee -a /etc/apt/sources.list
-			echo "rpm [alt] ftp://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/$arch classic" | sudocmd tee -a /etc/apt/sources.list
+			echo "rpm [alt] http://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/$arch classic" | sudocmd tee -a /etc/apt/sources.list
 			if [ "$arch" = "x86_64" ] ; then
-				echo "rpm [alt] ftp://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/$arch-i586 classic" | sudocmd tee -a /etc/apt/sources.list
+				echo "rpm [alt] http://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/$arch-i586 classic" | sudocmd tee -a /etc/apt/sources.list
 			fi
-			echo "rpm [alt] ftp://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/noarch classic" | sudocmd tee -a /etc/apt/sources.list
+			echo "rpm [alt] http://ftp.altlinux.org/pub/distributions archive/sisyphus/date/$datestr/noarch classic" | sudocmd tee -a /etc/apt/sources.list
 			return 0
 			;;
 	esac
@@ -75,7 +75,7 @@ __epm_addrepo_altlinux()
 
 	if [ -z "$repo" ] ; then
 		info "Add branch repo. TODO?"
-		sudodocmd apt-repo add branch
+		sudocmd apt-repo add branch
 		return
 	fi
 

bin/epm-search

@@ -109,7 +109,6 @@ esac
 LANG=C docmd $CMD $string
 }
 
-# TODO: use ^ as first word, use ~ for negate, for epmqp too
 # produce grep sequence
 __epm_search_make_grep()
 {
@@ -120,8 +119,8 @@ __epm_search_make_grep()
 	local listN=
 	for i in $@ ; do
 		case "$i" in
-			^*)
-				# will clean from ^ later (and have the bug here with empty arg if run with one ^ only)
+			~*)
+				# will clean from ~ later (and have the bug here with empty arg if run with one ~ only)
 				listN="$listN $i"
 				;;
 			*)
@@ -131,7 +130,7 @@ __epm_search_make_grep()
 	done
 
 	#list=$(strip_spaces $list | sed -e "s/ /|/g")
-	listN=$(strip_spaces $listN | sed -e "s/ /|/g" | sed -e "s/\^//g")
+	listN=$(strip_spaces $listN | sed -e "s/ /|/g" | sed -e "s/~//g")
 
 	if [ -n "$short" ] ; then
 		echon " | sed -e \"s| .*||g\""

bin/epm-sh-functions

@@ -297,12 +297,12 @@ withtimeout()
 {
 	local TO=$(which timeout 2>/dev/null || which gtimeout 2>/dev/null)
 	if [ -x "$TO" ] ; then
-		$TO $@
+		$TO "$@"
 		return
 	fi
 	# fallback: drop time arg and run without timeout
 	shift
-	$@
+	"$@"
 }
 
 set_eatmydata()

eepm.spec

 # This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
 #
 Name: eepm
-Version: 2.1.7
+Version: 2.1.8
 Release: alt0.M80P.1
 
 Summary: Etersoft EPM package manager
@@ -68,9 +68,13 @@ chmod a+x %buildroot%_datadir/%name/tools_*
 %_sysconfdir/bash_completion.d/cerv
 
 %changelog
-* Wed Oct 25 2017 Vitaly Lipatov <lav@altlinux.ru> 2.1.7-alt0.M80P.1
+* Thu Nov 02 2017 Vitaly Lipatov <lav@altlinux.ru> 2.1.8-alt0.M80P.1
 - backport to ALTLinux p8 (by rpmbph script)
 
+* Thu Nov 02 2017 Vitaly Lipatov <lav@altlinux.ru> 2.1.8-alt1
+- epm addrepo: use http for ALT archive, add date format checking
+- ep-seach: use ~ for negate and ^ for a begin of line in __epm_search_make_grep
+
 * Mon Oct 23 2017 Vitaly Lipatov <lav@altlinux.ru> 2.1.7-alt1
 - improve addrepo (add archive DATE support) and removerepo (archive, tasks)