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

TODO

+/etc/eepm.conf конфиг
+
 FIXME: epm-install need realpath, missed on some systems
 
 Lock a Specific Package

bin/distr_info

@@ -116,10 +116,6 @@ if distro altlinux-release ; then
 	elif has Citron   ; then DISTRIB_RELEASE="2.4"
 	fi
 
-elif [ `uname -o` = "Cygwin" ] ; then
-        DISTRIB_ID="Cygwin"
-        DISTRIB_RELEASE="all"
-
 elif distro gentoo-release ; then
 	DISTRIB_ID="Gentoo"
 	MAKEPROFILE=$(readlink $ROOTDIR/etc/portage/make.profile 2>/dev/null) || MAKEPROFILE=$(readlink $ROOTDIR/etc/make.profile)
@@ -281,7 +277,7 @@ elif [ `uname` = "SunOS" ] ; then
 	DISTRIB_RELEASE=$(uname -r)
 
 # fixme: can we detect by some file?
-elif [ `uname` = "Darwin" ] ; then
+elif [ `uname -s 2>/dev/null` = "Darwin" ] ; then
 	DISTRIB_ID="MacOS"
 	DISTRIB_RELEASE=$(uname -r)
 
@@ -295,6 +291,10 @@ elif [ `uname` = "Linux" ] && [ -x $ROOTDIR/system/bin/getprop ] ; then
 	DISTRIB_ID="Android"
 	DISTRIB_RELEASE=$(getprop | awk -F": " '/build.version.release/ { print $2 }' | tr -d '[]')
 
+elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then
+        DISTRIB_ID="Cygwin"
+        DISTRIB_RELEASE="all"
+
 # try use standart LSB info by default
 elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then
 	# use LSB

bin/epm-autoremove

@@ -24,7 +24,8 @@ __epm_autoremove_altrpm()
 	assure_exists /etc/buildreqs/files/ignore.d/apt-scripts apt-scripts
 	info
 	info "Removing all non -devel/-debuginfo libs packages not need by anything..."
-	[ -n "$force" ] || info "You can run with --force for more deep removing"
+	#[ -n "$force" ] || info "You can run with --force for more deep removing"
+	local force=force
 
 	local flag=
 	local libexclude='^lib'
@@ -34,7 +35,7 @@ __epm_autoremove_altrpm()
 	showcmd "apt-cache list-nodeps | grep -- \"$libexclude\""
 	pkgs=$(apt-cache list-nodeps | grep -- "$libexclude" \
 		| grep -E -v -- "-(devel|debuginfo)$" \
-		| grep -E -v -- "-(util|tool|plugin|daemon)" \
+		| grep -E -v -- "-(util|utils|tool|tools|plugin|daemon|help)$" \
 		| sed -e "s/\.32bit$//g" \
 		| grep -E -v -- "^(libsystemd|libreoffice|libnss|libvirt-client|libvirt-daemon|eepm)" )
 	[ -n "$pkgs" ] && sudocmd rpm -v -e $pkgs && flag=1

bin/epm-check

@@ -60,7 +60,7 @@ case $PMTYPE in
 		sudocmd pkg check -d -a
 		;;
 	homebrew)
-		sudocmd brew doctor
+		docmd brew doctor
 		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"

bin/epm-filelist

@@ -120,6 +120,9 @@ __epm_filelist_name()
 			assure_exists equery
 			CMD="equery files"
 			;;
+		homebrew)
+			CMD="brew list"
+			;;
 		pkgng)
 			CMD="pkg info -l"
 			;;

bin/epm-install

@@ -146,7 +146,7 @@ epm_install_names()
 			return ;;
 		homebrew)
 			# FIXME: sudo and quote
-			__separate_sudocmd "brew install" "brew upgrade" $@
+			SUDO= __separate_sudocmd "brew install" "brew upgrade" $@
 			return ;;
 		ipkg)
 			[ -n "$force" ] && force=-force-depends
@@ -241,6 +241,10 @@ epm_ni_install_names()
 		xbps)
 			sudocmd xbps-install -y $@
 			return ;;
+		homebrew)
+			# FIXME: sudo and quote
+			SUDO= __separate_sudocmd "brew install" "brew upgrade" $@
+			return ;;
 		#android)
 		#	sudocmd pm install $@
 		#	return ;;
@@ -491,6 +495,10 @@ epm_print_install_command()
         xbps)
             echo "xbps-install -y $@"
             ;;
+        homebrew)
+            # FIXME: sudo and quote
+            echo "brew install $@"
+            ;;
 
         *)
             fatal "Have no suitable appropriate install command for $PMTYPE"

bin/epm-packages

@@ -128,7 +128,7 @@ case $PMTYPE in
 		fi
 		;;
 	homebrew)
-		CMD="brew list $pkg_filenames"
+		docmd brew list | xargs -n1 echo
 		;;
 	ipkg)
 		CMD="ipkg list"
@@ -174,7 +174,7 @@ case $PMTYPE in
 		;;
 esac
 
-docmd $CMD | __fopfn
+docmd $CMD | __fo_pfn
 # FIXME: we print empty lines, but will lost error status
 
 }

bin/epm-query

 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2015  Etersoft
-# Copyright (C) 2012, 2013, 2015  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012, 2013, 2015, 2016  Etersoft
+# Copyright (C) 2012, 2013, 2015, 2016  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -186,7 +186,7 @@ __epm_query_name()
 			CMD="conary query"
 			;;
 		homebrew)
-			warning "fix query"
+			docmd brew info "$1" >/dev/null 2>/dev/null && echo "$1" && return
 			return 1
 			;;
 		# TODO: need to print name if exists
@@ -228,7 +228,7 @@ __epm_query_shortname()
 			CMD="conary query"
 			;;
 		homebrew)
-			warning "fix query"
+			docmd brew info "$1" >/dev/null 2>/dev/null && echo "$1" && return
 			return 1
 			;;
 		# TODO: need to print name if exists

bin/epm-remove

@@ -123,7 +123,7 @@ epm_remove_names()
 			sudocmd /usr/sbin/slackpkg remove $@
 			return ;;
 		homebrew)
-			sudocmd brew remove $@
+			docmd brew remove $@
 			return ;;
 		aptcyg)
 			sudocmd apt-cyg remove $@

bin/epm-sh-functions

@@ -516,5 +516,5 @@ is_active_systemd()
 	[ -d "$SYSTEMD_CGROUP_DIR" ] || return
 	a= mountpoint -q "$SYSTEMD_CGROUP_DIR" || return
 	# some hack
-	pidof systemd >/dev/null
+	ps ax | grep -q systemd >/dev/null
 }

bin/epm-site

@@ -49,7 +49,7 @@ __query_package_hl_url()
 			# http://petstore.swagger.io/?url=http://packages.altlinux.org/api/docs
 			epm assure curl || return 1
 			showcmd curl "$PAOAPI/srpms/$1"
-			curl -s --header "Accept: application/json" "$PAOAPI/srpms/$1" | grep '"url"' | sed -e 's|.*"url":"||g' | sed -e 's|".*||g'
+			a= curl -s --header "Accept: application/json" "$PAOAPI/srpms/$1" | grep '"url"' | sed -e 's|.*"url":"||g' | sed -e 's|".*||g'
 			return 0
 			;;
 	esac

bin/epm-update

@@ -75,7 +75,7 @@ case $PMTYPE in
 		sudocmd packdcl detect # get packages from MSI database
 		;;
 	homebrew)
-		sudocmd brew update
+		docmd brew update
 		;;
 	ipkg)
 		sudocmd ipkg update

bin/epm-upgrade

@@ -81,7 +81,7 @@ epm_upgrade()
 		;;
 	homebrew)
 		#CMD="brew upgrade"
-		sudocmd "brew upgrade `brew outdated`"
+		docmd "brew upgrade `brew outdated`"
 		return
 		;;
 	ipkg)

bin/serv

@@ -130,7 +130,7 @@ $(get_help HELPOPT)
 print_version()
 {
         echo "Service manager version @VERSION@"
-        echo "Running on $($DISTRVENDOR)"
+        echo "Running on $($DISTRVENDOR) with $SERVICETYPE"
         echo "Copyright (c) Etersoft 2012, 2013, 2016"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
 }

check_eepm.log

+/bin/echo
+coreutils
+eepm
+file
+findutils
+grep
+less
+procps
+rpm
+sed
+sudo
+termutils
+which

check_reqs.sh

 #!/bin/sh
-/usr/lib/rpm/shell.req bin/epm-* | sort -u
+/usr/lib/rpm/shell.req bin/epm-* | sort -u | tee ./check_eepm.log
+git diff ./check_eepm.log

eepm.spec

 # This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
 #
 Name: eepm
-Version: 1.9.3
+Version: 1.9.4
 Release: alt0.M80P.1
 
 Summary: Etersoft EPM package manager
@@ -52,6 +52,7 @@ ln -s serv %buildroot%_sysconfdir/bash_completion.d/cerv
 
 # shebang.req.files
 chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
+chmod a+x %buildroot%_datadir/%name/tools_*
 
 %files
 %doc README TODO LICENSE
@@ -67,9 +68,15 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
 %_sysconfdir/bash_completion.d/cerv
 
 %changelog
-* Wed Aug 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.3-alt0.M80P.1
+* Fri Sep 23 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.4-alt0.M80P.1
 - backport to ALTLinux p8 (by rpmbph script)
 
+* Fri Sep 23 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.4-alt1
+- distr_info: fix checking on MacOS
+- brew fixes
+- autoremove: enable deep remove by default
+- small fixes
+
 * Wed Aug 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.3-alt1
 - implement cross install for rpm and deb packages
 - serv: add runit support (Void Linux)

packed/epm.sh

 #!/bin/sh
 #
-# Copyright (C) 2012-2014  Etersoft
-# Copyright (C) 2012-2014  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012-2016  Etersoft
+# Copyright (C) 2012-2016  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,10 +17,12 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-PROGDIR=$(dirname $0)
+PROGDIR=$(dirname "$0")
+PROGNAME=$(basename "$0")
 [ "$PROGDIR" = "." ] && PROGDIR=$(pwd)
 if [ "$0" = "/dev/stdin" ] || [ "$0" = "sh" ] ; then
     PROGDIR=""
+    PROGNAME=""
 fi
 
 # will replaced to /usr/share/eepm during install
@@ -209,6 +211,12 @@ store_output()
     #return $PIPESTATUS
 }
 
+showcmd_store_output()
+{
+    showcmd "$@"
+    store_output "$@"
+}
+
 clean_store_output()
 {
     rm -f $RC_STDOUT $RC_STDOUT.pipestatus
@@ -216,7 +224,8 @@ clean_store_output()
 
 epm()
 {
-	$PROGDIR/epm $@
+	[ -n "$PROGNAME" ] || fatal "Can't use epm call from the piped script"
+	$PROGDIR/$PROGNAME $@
 }
 
 fatal()
@@ -479,6 +488,9 @@ case $DISTRNAME in
 	TinyCoreLinux)
 		CMD="tce"
 		;;
+	VoidLinux)
+		CMD="xbps"
+		;;
 	*)
 		fatal "Have no suitable DISTRNAME $DISTRNAME"
 		;;
@@ -503,26 +515,27 @@ is_active_systemd()
 
 epm_addrepo()
 {
+local repo="$(eval echo $quoted_args)"
 case $PMTYPE in
 	apt-rpm)
 		assure_exists apt-repo
-		sudocmd apt-repo add "$pkg_filenames"
+		sudocmd apt-repo add "$repo"
 		;;
 	apt-dpkg|aptitude-dpkg)
 		info "You need manually add repo to /etc/apt/sources.list"
 		;;
 	yum-rpm)
 		assure_exists yum-utils
-		sudocmd yum-config-manager --add-repo "$pkg_filenames"
+		sudocmd yum-config-manager --add-repo "$repo"
 		;;
 	urpm-rpm)
-		sudocmd urpmi.addmedia "$pkg_filenames"
+		sudocmd urpmi.addmedia "$repo"
 		;;
 	zypper-rpm)
-		sudocmd zypper ar "$pkg_filenames"
+		sudocmd zypper ar "$repo"
 		;;
 	emerge)
-		sudocmd layman -a $"pkg_filenames"
+		sudocmd layman -a "$repo"
 		;;
 	pacman)
 		info "You need manually add repo to /etc/pacman.conf"
@@ -530,7 +543,7 @@ case $PMTYPE in
 		#sudocmd repo-add $pkg_filenames
 		;;
 	npackd)
-		sudocmd npackdcl add-repo --url="$pkg_filenames"
+		sudocmd npackdcl add-repo --url="$repo"
 		;;
 	slackpkg)
 		info "You need manually add repo to /etc/slackpkg/mirrors"
@@ -735,6 +748,9 @@ case $PMTYPE in
 		local PKGLIST=$(zypper packages --orphaned | tail -n +5 | cut -d \| -f 3 | sort -u)
 		sudocmd zypper remove --clean-deps $PKGLIST
 		;;
+	xbps)
+		CMD="xbps-remove -o"
+		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
 		;;
@@ -750,7 +766,8 @@ __epm_autoremove_altrpm()
 	assure_exists /etc/buildreqs/files/ignore.d/apt-scripts apt-scripts
 	info
 	info "Removing all non -devel/-debuginfo libs packages not need by anything..."
-	[ -n "$force" ] || info "You can run with --force for more deep removing"
+	#[ -n "$force" ] || info "You can run with --force for more deep removing"
+	local force=force
 
 	local flag=
 	local libexclude='^lib'
@@ -760,7 +777,7 @@ __epm_autoremove_altrpm()
 	showcmd "apt-cache list-nodeps | grep -- \"$libexclude\""
 	pkgs=$(apt-cache list-nodeps | grep -- "$libexclude" \
 		| grep -E -v -- "-(devel|debuginfo)$" \
-		| grep -E -v -- "-(util|tool|plugin|daemon)" \
+		| grep -E -v -- "-(util|utils|tool|tools|plugin|daemon|help)$" \
 		| sed -e "s/\.32bit$//g" \
 		| grep -E -v -- "^(libsystemd|libreoffice|libnss|libvirt-client|libvirt-daemon|eepm)" )
 	[ -n "$pkgs" ] && sudocmd rpm -v -e $pkgs && flag=1
@@ -852,6 +869,9 @@ case $PMTYPE in
 		local PKGLIST=$(zypper packages --unneeded | tail -n +5 | cut -d \| -f 3 | sort -u)
 		sudocmd zypper remove --clean-deps $PKGLIST
 		;;
+	xbps)
+		CMD="xbps-remove -O"
+		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
 		;;
@@ -1004,7 +1024,7 @@ case $PMTYPE in
 		sudocmd pkg check -d -a
 		;;
 	homebrew)
-		sudocmd brew doctor
+		docmd brew doctor
 		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
@@ -1240,6 +1260,9 @@ case $PMTYPE in
 	pkgng)
 		sudocmd pkg clean -a
 		;;
+	xbps)
+		sudocmd xbps-remove -O
+		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
 		;;
@@ -1563,9 +1586,15 @@ __epm_filelist_name()
 			assure_exists equery
 			CMD="equery files"
 			;;
+		homebrew)
+			CMD="brew list"
+			;;
 		pkgng)
 			CMD="pkg info -l"
 			;;
+		xbps)
+			CMD="xbps-query -f"
+			;;
 		aptcyg)
 			docmd apt-cyg listfiles $@ | sed -e "s|^|/|g"
 			return
@@ -1682,6 +1711,9 @@ case $PMTYPE in
 	pkgng)
 		docmd pkg info $pkg_names
 		;;
+	xbps)
+		docmd xbps-query --show $pkg_names
+		;;
 	homebrew)
 		docmd brew info $pkg_names
 		;;
@@ -1818,7 +1850,7 @@ epm_install_names()
 			return ;;
 		homebrew)
 			# FIXME: sudo and quote
-			__separate_sudocmd "brew install" "brew upgrade" $@
+			SUDO= __separate_sudocmd "brew install" "brew upgrade" $@
 			return ;;
 		ipkg)
 			[ -n "$force" ] && force=-force-depends
@@ -1842,6 +1874,9 @@ epm_install_names()
 		aptcyg)
 			sudocmd apt-cyg install $@
 			return ;;
+		xbps)
+			sudocmd xbps-install $@
+			return ;;
 		*)
 			fatal "Have no suitable install command for $PMTYPE"
 			;;
@@ -1906,6 +1941,13 @@ epm_ni_install_names()
 		tce)
 			sudocmd tce-load -wi $@
 			return ;;
+		xbps)
+			sudocmd xbps-install -y $@
+			return ;;
+		homebrew)
+			# FIXME: sudo and quote
+			SUDO= __separate_sudocmd "brew install" "brew upgrade" $@
+			return ;;
 		#android)
 		#	sudocmd pm install $@
 		#	return ;;
@@ -1941,8 +1983,11 @@ __epm_check_if_try_install_deb()
 	local TDIR=$(mktemp -d)
 	cd $TDIR
 	for pkg in $debpkgs ; do
-		showcmd alien -r -k --scripts "$pkg"
-		# TODO: need check for return status
+		# TODO: fakeroot for non ALT?
+		showcmd_store_output alien -r -k --scripts "$pkg" || fatal
+		local RPMCONVERTED=$(grep "rpm generated" $RC_STDOUT | sed -e "s| generated||g")
+		clean_store_output
+		epm install $RPMCONVERTED
 	done
 	rm -f $TDIR/*
 	rmdir $TDIR/
@@ -1962,12 +2007,16 @@ __epm_check_if_try_install_rpm()
 	[ -n "$rpmpkgs" ] || return 1
 
 	assure_exists alien
+	assure_exists fakeroot
 
 	local TDIR=$(mktemp -d)
 	cd $TDIR
 	for pkg in $rpmpkgs ; do
-		showcmd alien -d -k --scripts "$pkg"
-		# TODO: need check for return status
+		showcmd_store_output fakeroot alien -d -k --scripts "$pkg"
+		clean_store_output
+		local DEBCONVERTED=$(grep "deb generated" $RC_STDOUT | sed -e "s| generated||g")
+		clean_store_output
+		epm install $DEBCONVERTED
 	done
 	rm -f $TDIR/*
 	rmdir $TDIR/
@@ -1992,7 +2041,7 @@ epm_install_files()
             if ! is_dirpath "$@" || [ "$(get_package_type "$@")" = "rpm" ] ; then
                 sudocmd rpm -Uvh $force $nodeps $@ && return
                 local RES=$?
-
+                # TODO: check rpm result code and convert it to compatible format if possible
                 __epm_check_if_rpm_already_installed $@ && return
 
             # if run with --nodeps, do not fallback on hi level
@@ -2143,6 +2192,14 @@ epm_print_install_command()
         tce)
             echo "tce-load -wi $@"
             ;;
+        xbps)
+            echo "xbps-install -y $@"
+            ;;
+        homebrew)
+            # FIXME: sudo and quote
+            echo "brew install $@"
+            ;;
+
         *)
             fatal "Have no suitable appropriate install command for $PMTYPE"
             ;;
@@ -2165,14 +2222,8 @@ download_pkg_urls()
 	done
 }
 
-
-
-__handle_pkg_urls()
+__use_url_install()
 {
-	[ -n "$pkg_urls" ] || return
-
-	# TODO: do it correcly
-	to_remove_pkg_files=
 	case $PMTYPE in
 		apt-rpm)
 			# ALT Linux really?
@@ -2194,10 +2245,23 @@ __handle_pkg_urls()
 		#	pkg_names="$pkg_names $pkg_urls"
 		#	;;
 		*)
-			# use workaround with eget: download and put in pkg_files
-			download_pkg_urls
+			return 1
 			;;
 	esac
+	return 0
+}
+
+__handle_pkg_urls()
+{
+	[ -n "$pkg_urls" ] || return
+
+	# TODO: do it correctly
+	to_remove_pkg_files=
+	
+	if [ "$(get_package_type "$pkg")" != $PKGFORMAT ] || ! __use_url_install ; then
+		# use workaround with eget: download and put in pkg_files
+		download_pkg_urls
+	fi
 	pkg_urls=
 }
 
@@ -2413,6 +2477,11 @@ __aptcyg_print_full()
 	echo "$1-$VERSION"
 }
 
+__fo_pfn()
+{
+	grep -v "^$" | grep -- "$pkg_filenames"
+}
+
 epm_packages()
 {
 	local CMD
@@ -2420,23 +2489,28 @@ epm_packages()
 
 case $PMTYPE in
 	apt-rpm)
+		# FIXME: strong equal
 		CMD="rpm -qa $pkg_filenames"
 		[ -n "$short" ] && CMD="rpm -qa --queryformat %{name}\n $pkg_filenames"
-		;;
+		docmd $CMD
+		return ;;
 	*-dpkg)
+		# FIXME: strong equal
 		#CMD="dpkg -l $pkg_filenames"
 		CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}-\${Version}\n $pkg_filenames"
 		[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}\n $pkg_filenames"
-		docmd $CMD | grep "^i" | sed -e "s|.* ||g"
-		return
-		;;
+		showcmd $CMD
+		$CMD | grep "^i" | sed -e "s|.* ||g" | __fo_pfn
+		return ;;
 	snappy)
 		CMD="snappy info"
 		;;
 	yum-rpm|urpm-rpm|zypper-rpm|dnf-rpm)
+		# FIXME: strong equal
 		CMD="rpm -qa $pkg_filenames"
 		[ -n "$short" ] && CMD="rpm -qa --queryformat %{name}\n $pkg_filenames"
-		;;
+		docmd $CMD
+		return ;;
 	emerge)
 		CMD="qlist -I -C"
 		# print with colors for console output
@@ -2444,26 +2518,27 @@ case $PMTYPE in
 		;;
 	pkgsrc)
 		CMD="pkg_info"
-		docmd $CMD | sed -e "s| .*||g"
-		return
-		;;
+		showcmd $CMD
+		$CMD | sed -e "s| .*||g" | __fo_pfn
+		return ;;
 	pkgng)
 		if [ -n "$pkg_filenames" ] ; then
 			CMD="pkg info -E $pkg_filenames"
 		else
 			CMD="pkg info"
 		fi
+		showcmd $CMD
 		if [ -n "$short" ] ; then
-		    docmd $CMD | sed -e "s| .*||g" | sed -e "s|-[0-9].*||g"
+		    $CMD | sed -e "s| .*||g" | sed -e "s|-[0-9].*||g" | __fo_pfn
 		else
-		    docmd $CMD | sed -e "s| .*||g"
+		    $CMD | sed -e "s| .*||g" | __fo_pfn
 		fi
-		return
-		;;
+		return ;;
 	pacman)
 		CMD="pacman -Qs $pkg_filenames"
+		showcmd $CMD
 		if [ -n "$short" ] ; then
-			docmd $CMD | sed -e "s| .*||g" -e "s|.*/||g" | grep -v "^$"
+			$CMD | sed -e "s| .*||g" -e "s|.*/||g" | __fo_pfn
 			return
 		fi
 		;;
@@ -2483,12 +2558,12 @@ case $PMTYPE in
 			# FIXME: does not work for libjpeg-v8a
 			# TODO: remove last 3 elements (if arch is second from the last?)
 			# FIXME this hack
-			docmd ls -1 /var/log/packages/ | sed -e "s|-[0-9].*||g" | sed -e "s|libjpeg-v8a.*|libjpeg|g"
+			docmd ls -1 /var/log/packages/ | sed -e "s|-[0-9].*||g" | sed -e "s|libjpeg-v8a.*|libjpeg|g" | __fo_pfn
 			return
 		fi
 		;;
 	homebrew)
-		CMD="brew list $pkg_filenames"
+		docmd brew list | xargs -n1 echo
 		;;
 	ipkg)
 		CMD="ipkg list"
@@ -2502,9 +2577,20 @@ case $PMTYPE in
 	guix)
 		CMD="guix package -I"
 		;;
+	xbps)
+		CMD="xbps-query -l"
+		showcmd $CMD
+		if [ -n "$short" ] ; then
+			$CMD | sed -e "s|^ii ||g" -e "s| .*||g" -e "s|\(.*\)-.*|\1|g" | __fo_pfn
+		else
+			$CMD | sed -e "s|^ii ||g" -e "s| .*||g" | __fo_pfn
+		fi
+		return 0
+		;;
 	android)
 		CMD="pm list packages"
-		docmd $CMD | sed -e "s|^package:||g"
+		showcmd $CMD
+		$CMD | sed -e "s|^package:||g" | __fo_pfn
 		return
 		;;
 	aptcyg)
@@ -2523,7 +2609,7 @@ case $PMTYPE in
 		;;
 esac
 
-docmd $CMD
+docmd $CMD | __fo_pfn
 
 }
 
@@ -2875,16 +2961,18 @@ _get_grep_exp()
 
 _shortquery_via_packages_list()
 {
-	local res=0
+	local res=1
 	local grepexp
 	local firstpkg=$1
 	shift
 
 	grepexp=$(_get_grep_exp $firstpkg)
 
+	# TODO: we miss status due grep
+	# Note: double call due stderr redirect
 	# Note: we use short=1 here due grep by ^name$
 	# separate first line for print out command
-	short=1 pkg_filenames=$firstpkg epm_packages | grep -- "$grepexp" || res=1
+	short=1 pkg_filenames=$firstpkg epm_packages | grep -- "$grepexp" && res=0 || res=1
 
 	local pkg
 	for pkg in "$@" ; do
@@ -2897,16 +2985,19 @@ _shortquery_via_packages_list()
 
 _query_via_packages_list()
 {
-	local res=0
+	local res=1
 	local grepexp
 	local firstpkg=$1
 	shift
 
 	grepexp=$(_get_grep_exp $firstpkg)
 
+	# TODO: we miss status due grep
+	# TODO: grep correctly
+	# Note: double call due stderr redirect
 	# Note: we use short=1 here due grep by ^name$
 	# separate first line for print out command
-	short=1 pkg_filenames=$firstpkg epm_packages | grep -q -- "$grepexp" && quiet=1 pkg_filenames=$firstpkg epm_packages || res=1
+	short=1 pkg_filenames=$firstpkg epm_packages | grep -q -- "$grepexp" && quiet=1 pkg_filenames=$firstpkg epm_packages && res=0 || res=1
 
 	local pkg
 	for pkg in "$@" ; do
@@ -3059,7 +3150,7 @@ __epm_query_shortname()
 			CMD="conary query"
 			;;
 		homebrew)
-			warning "fix query"
+			docmd brew info "$1" >/dev/null 2>/dev/null && echo "$1" && return
 			return 1
 			;;
 		# TODO: need to print name if exists
@@ -3188,6 +3279,10 @@ __do_query()
         ipkg)
             CMD="ipkg files"
             ;;
+        xbps)
+            # FIXME: maybe it is search file?
+            CMD="xbps-query -o"
+            ;;
         aptcyg)
             #CMD="apt-cyg packageof"
             # do not realized locally
@@ -3389,7 +3484,7 @@ __replace_alt_version_in_repo()
 	#echo "Upgrading $DISTRNAME from $1 to $2 ..."
 	docmd apt-repo list | sed -e "s|\($1\)|{\1}->{$2}|g" | egrep --color -- "$1"
 	# ask and replace only we will have changes
-	if apt-repo list | egrep -q -- "$1" ; then
+	if a= apt-repo list | egrep -q -- "$1" ; then
 		confirm "Are these correct changes? [y/N]" || fatal "Exiting"
 		__replace_text_in_alt_repo "/^ *#/! s!$1!$2!g"
 	fi
@@ -3701,11 +3796,14 @@ epm_remove_names()
 			sudocmd /usr/sbin/slackpkg remove $@
 			return ;;
 		homebrew)
-			sudocmd brew remove $@
+			docmd brew remove $@
 			return ;;
 		aptcyg)
 			sudocmd apt-cyg remove $@
 			return ;;
+		xbps)
+			sudocmd xbps remove -R $@
+			return ;;
 		ipkg)
 			sudocmd ipkg $(subst_option force -force-depends) remove $@
 			return ;;
@@ -3748,6 +3846,9 @@ epm_remove_nonint()
 		ipkg)
 			sudocmd ipkg -force-defaults remove $@
 			return ;;
+		xbps)
+			sudocmd xbps remove -y $@
+			return ;;
 	esac
 	return 5
 }
@@ -3782,6 +3883,9 @@ epm_print_remove_command()
 		aptcyg)
 			echo "apt-cyg remove $@"
 			;;
+		xbps)
+			echo "xbps remove -y $@"
+			;;
 		*)
 			fatal "Have no suitable appropriate remove command for $PMTYPE"
 			;;
@@ -3851,6 +3955,9 @@ epm_remove_old_kernels()
 	Gentoo)
 		sudocmd emerge -P gentoo-sources
 		return ;;
+	VoidLinux)
+		sudocmd vkpurge rm all
+		return ;;
 	esac
 
 	case $PMTYPE in
@@ -3864,32 +3971,33 @@ epm_remove_old_kernels()
 
 epm_removerepo()
 {
+local repo="$(eval echo $quoted_args)"
 case $PMTYPE in
 	apt-rpm)
 		assure_exists apt-repo
-		sudocmd apt-repo rm "$quoted_args"
+		sudocmd apt-repo rm "$repo"
 		;;
 	apt-dpkg|aptitude-dpkg)
 		info "You need remove repo from /etc/apt/sources.list"
 		;;
 	yum-rpm)
 		assure_exists yum-utils
-		sudocmd yum-config-manager --disable "$pkg_filenames"
+		sudocmd yum-config-manager --disable "$repo"
 		;;
 	urpm-rpm)
-		sudocmd urpmi.removemedia "$pkg_filenames"
+		sudocmd urpmi.removemedia "$repo"
 		;;
 	zypper-rpm)
-		sudocmd zypper removerepo "$pkg_filenames"
+		sudocmd zypper removerepo "$repo"
 		;;
 	emerge)
-		sudocmd layman "-d$pkg_filenames"
+		sudocmd layman "-d$repo"
 		;;
 	pacman)
 		info "You need remove repo from /etc/pacman.conf"
 		;;
 	npackd)
-		sudocmd npackdcl remove-repo --url="$pkg_filenames"
+		sudocmd npackdcl remove-repo --url="$repo"
 		;;
 	slackpkg)
 		info "You need remove repo from /etc/slackpkg/mirrors"
@@ -3969,14 +4077,18 @@ case $PMTYPE in
 		__fix_apt_sources_list /etc/apt/sources.list
 		__fix_apt_sources_list /etc/apt/sources.list.d/*.list
 		docmd apt-repo list
-
+		# FIXME: what the best place?
 		# rebuild rpm database
 		#sudocmd rm -fv /var/lib/rpm/__db*
 		#sudocmd rpm --rebuilddb
 		;;
 	yum-rpm|dnf-rpm)
-		sudocmd rm -fv /var/lib/rpm/__db*
-		sudocmd rpm --rebuilddb
+		# FIXME: what the best place?
+		#sudocmd rm -fv /var/lib/rpm/__db*
+		#sudocmd rpm --rebuilddb
+		;;
+	xbps)
+		sudocmd xbps-pkgdb -a
 		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
@@ -4028,6 +4140,9 @@ case $PMTYPE in
 		docmd eselect profile list
 		docmd layman -L
 		;;
+	xbps)
+		docmd xbps-query -L
+		;;
 	pacman)
 		docmd grep -v -- "^#\|^$" /etc/pacman.conf
 		;;
@@ -4128,6 +4243,9 @@ case $PMTYPE in
 		#CMD="pkg rquery '%dn-%dv'"
 		CMD="pkg info -d"
 		;;
+	xbps)
+		CMD="xbps-query -x"
+		;;
 	aptcyg)
 		#CMD="apt-cyg depends"
 		# print show version
@@ -4232,6 +4350,9 @@ case $PMTYPE in
 	aptcyg)
 		CMD="apt-cyg searchall"
 		;;
+	xbps)
+		CMD="xbps-query -s"
+		;;
 	*)
 		fatal "Have no suitable search command for $PMTYPE"
 		;;
@@ -4369,6 +4490,9 @@ case $PMTYPE in
 	ipkg)
 		CMD="ipkg search"
 		;;
+	xbps)
+		CMD="xbps-query -Ro"
+		;;
 	aptcyg)
 		docmd apt-cyg searchall $(echo " $pkg_filenames" | sed -e "s| /| |g")
 		return
@@ -4701,7 +4825,7 @@ case $PMTYPE in
 		sudocmd packdcl detect # get packages from MSI database
 		;;
 	homebrew)
-		sudocmd brew update
+		docmd brew update
 		;;
 	ipkg)
 		sudocmd ipkg update
@@ -4716,6 +4840,9 @@ case $PMTYPE in
 	aptcyg)
 		sudocmd apt-cyg update
 		;;
+	xbps)
+		sudocmd xbps-install -S
+		;;
 	*)
 		fatal "Have no suitable update command for $PMTYPE"
 		;;
@@ -4788,7 +4915,7 @@ epm_upgrade()
 		;;
 	homebrew)
 		#CMD="brew upgrade"
-		sudocmd "brew upgrade `brew outdated`"
+		docmd "brew upgrade `brew outdated`"
 		return
 		;;
 	ipkg)
@@ -4804,6 +4931,9 @@ epm_upgrade()
 		docmd_foreach "epm install" $(short=1 epm packages)
 		return
 		;;
+	xbps)
+		CMD="xbps-install -Su"
+		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
 		;;
@@ -4867,6 +4997,9 @@ case $PMTYPE in
 	aptcyg)
 		CMD="apt-cyg rdepends"
 		;;
+	xbps)
+		CMD="xbps-query -X"
+		;;
 	*)
 		fatal "Have no suitable command for $PMTYPE"
 		;;
@@ -4918,8 +5051,8 @@ docmd $CMD $pkg
 internal_distr_info()
 {
 # Author: Vitaly Lipatov <lav@etersoft.ru>
-# 2007, 2009, 2010, 2012 (c) Etersoft
-# 2007 Public domain
+# 2007, 2009, 2010, 2012, 2016 (c) Etersoft
+# 2007-2016 Public domain
 
 # Detect the distro and version
 # Welcome to send updates!
@@ -4950,6 +5083,7 @@ rpmvendor()
 	[ "$DISTRIB_ID" = "AstraLinux" ] && echo "astra" && return
 	[ "$DISTRIB_ID" = "LinuxXP" ] && echo "lxp" && return
 	[ "$DISTRIB_ID" = "TinyCoreLinux" ] && echo "tcl" && return
+	[ "$DISTRIB_ID" = "VoidLinux" ] && echo "void" && return
 	echo "$DISTRIB_ID" | tr "[A-Z]" "[a-z]"
 }
 
@@ -4973,6 +5107,7 @@ pkgtype()
 		android) echo "apk" ;;
 		alpine) echo "apk" ;;
 		tinycorelinux) echo "tcz" ;;
+		voidlinux) echo "xbps" ;;
 		cygwin) echo "tar.xz" ;;
 		debian|ubuntu|mint|runtu|mcst|astra) echo "deb" ;;
 		alt|asplinux|suse|mandriva|rosa|mandrake|pclinux|sled|sles)
@@ -5032,10 +5167,6 @@ if distro altlinux-release ; then
 	elif has Citron   ; then DISTRIB_RELEASE="2.4"
 	fi
 
-elif [ `uname -o` = "Cygwin" ] ; then
-        DISTRIB_ID="Cygwin"
-        DISTRIB_RELEASE="all"
-
 elif distro gentoo-release ; then
 	DISTRIB_ID="Gentoo"
 	MAKEPROFILE=$(readlink $ROOTDIR/etc/portage/make.profile 2>/dev/null) || MAKEPROFILE=$(readlink $ROOTDIR/etc/make.profile)
@@ -5065,6 +5196,11 @@ elif distro os-release && which tce-ab 2>/dev/null >/dev/null ; then
 	DISTRIB_ID="TinyCoreLinux"
 	DISTRIB_RELEASE="$VERSION_ID"
 
+elif distro os-release && which xbps-query 2>/dev/null >/dev/null ; then
+	. $ROOTDIR/etc/os-release
+	DISTRIB_ID="VoidLinux"
+	DISTRIB_RELEASE="Live"
+
 elif distro arch-release ; then
 	DISTRIB_ID="ArchLinux"
 	DISTRIB_RELEASE="2010"
@@ -5192,7 +5328,7 @@ elif [ `uname` = "SunOS" ] ; then
 	DISTRIB_RELEASE=$(uname -r)
 
 # fixme: can we detect by some file?
-elif [ `uname` = "Darwin" ] ; then
+elif [ `uname -s 2>/dev/null` = "Darwin" ] ; then
 	DISTRIB_ID="MacOS"
 	DISTRIB_RELEASE=$(uname -r)
 
@@ -5206,6 +5342,10 @@ elif [ `uname` = "Linux" ] && [ -x $ROOTDIR/system/bin/getprop ] ; then
 	DISTRIB_ID="Android"
 	DISTRIB_RELEASE=$(getprop | awk -F": " '/build.version.release/ { print $2 }' | tr -d '[]')
 
+elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then
+        DISTRIB_ID="Cygwin"
+        DISTRIB_RELEASE="all"
+
 # try use standart LSB info by default
 elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then
 	# use LSB
@@ -5251,7 +5391,7 @@ case $1 in
 		exit 0
 		;;
 	-V)
-		echo "20120519"
+		echo "20160822"
 		exit 0
 		;;
 	*)
@@ -5379,7 +5519,7 @@ $(get_help HELPOPT)
 
 print_version()
 {
-        echo "EPM package manager version 1.9.1"
+        echo "EPM package manager version 1.9.3"
         echo "Running on $($DISTRVENDOR) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
         echo "Copyright (c) Etersoft 2012-2016"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
@@ -5407,9 +5547,7 @@ pkg_names=
 pkg_urls=
 quoted_args=
 
-progname="${0##*/}"
-
-case $progname in
+case $PROGNAME in
     epmi)
         epm_cmd=install
         ;;
@@ -5454,12 +5592,17 @@ case $progname in
         ;;
     epm|upm|eepm)
         ;;
+    epm.sh)
+        ;;
     *)
         # epm by default
         # fatal "Unknown command: $progname"
         ;;
 esac
 
+# was called with alias name
+[ -n "$epm_cmd" ] && PROGNAME="epm"
+
 check_command()
 {
     # do not override command
@@ -5715,7 +5858,7 @@ pkg_filenames=$(strip_spaces "$pkg_files $pkg_names")
 if [ -z "$epm_cmd" ] ; then
     print_version
     echo
-    fatal "Run $ $progname --help for get help"
+    fatal "Run $ $PROGNAME --help for get help"
 fi
 
 # Use eatmydata for write specific operations

packed/serv.sh

@@ -204,6 +204,12 @@ store_output()
     #return $PIPESTATUS
 }
 
+showcmd_store_output()
+{
+    showcmd "$@"
+    store_output "$@"
+}
+
 clean_store_output()
 {
     rm -f $RC_STDOUT $RC_STDOUT.pipestatus
@@ -211,7 +217,8 @@ clean_store_output()
 
 epm()
 {
-	$PROGDIR/epm $@
+	[ -n "$PROGNAME" ] || fatal "Can't use epm call from the piped script"
+	$PROGDIR/$PROGNAME $@
 }
 
 fatal()
@@ -474,6 +481,9 @@ case $DISTRNAME in
 	TinyCoreLinux)
 		CMD="tce"
 		;;
+	VoidLinux)
+		CMD="xbps"
+		;;
 	*)
 		fatal "Have no suitable DISTRNAME $DISTRNAME"
 		;;
@@ -518,6 +528,9 @@ serv_common()
 				sudocmd systemctl "$@" $SERVICE
 			fi
 			;;
+		runit)
+			sudocmd sv $SERVICE "$@"
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -532,7 +545,7 @@ serv_disable()
 	local SERVICE="$1"
 
 	is_service_running $1 && { serv_stop $1 || return ; }
-	is_service_autostart $1 || { echo "Service $1 already disabled for startup" && return ; }
+	is_service_autostart $1 || { info "Service $1 already disabled for startup" && return ; }
 
 	case $SERVICETYPE in
 		service-chkconfig|service-upstart)
@@ -548,6 +561,9 @@ serv_disable()
 		systemd)
 			sudocmd systemctl disable $1
 			;;
+		runit)
+			sudocmd rm -fv /var/service/$SERVICE
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -561,7 +577,7 @@ __serv_enable()
 {
 	local SERVICE="$1"
 
-	is_service_autostart $1 && echo "Service $1 already enabled for startup" && return
+	is_service_autostart $1 && info "Service $1 is already enabled for startup" && return
 
 	case $SERVICETYPE in
 		service-chkconfig)
@@ -582,6 +598,11 @@ __serv_enable()
 		systemd)
 			sudocmd systemctl enable $1
 			;;
+		runit)
+			epm assure $SERVICE
+			[ -r "/etc/sv/$SERVICE" ] || fatal "Can't find /etc/sv/$SERVICE"
+			sudocmd ln -s /etc/sv/$SERVICE /var/service/
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -593,7 +614,8 @@ serv_enable()
 {
 	__serv_enable "$1" || return
 	# start if need
-	is_service_running $1 || serv_start $1 || return
+	is_service_running $1 && info "Service $1 is already running" && return
+	serv_start $1
 }
 
 # File bin/serv-list:
@@ -694,7 +716,8 @@ serv_reload()
 			sudocmd systemctl reload $SERVICE "$@"
 			;;
 		*)
-			fatal "Have no suitable command for $SERVICETYPE"
+			info "Fallback to restart..."
+			serv_restart "$SERVICE" "$@"
 			;;
 	esac
 }
@@ -721,6 +744,9 @@ serv_restart()
 		systemd)
 			sudocmd systemctl restart $SERVICE "$@"
 			;;
+		runit)
+			sudocmd sv restart "$SERVICE"
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -748,6 +774,9 @@ serv_start()
 		systemd)
 			sudocmd systemctl start "$SERVICE" "$@"
 			;;
+		runit)
+			sudocmd sv up "$SERVICE"
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -774,6 +803,9 @@ is_service_running()
 		systemd)
 			$SUDO systemctl status $1 >/dev/null
 			;;
+		runit)
+			$SUDO sv status "$SERVICE" >/dev/null
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -800,6 +832,9 @@ is_service_autostart()
 		systemd)
 			$SUDO systemctl is-enabled $1
 			;;
+		runit)
+			test -L /var/service/$SERVICE
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -827,6 +862,9 @@ serv_status()
 		systemd)
 			sudocmd systemctl status $SERVICE "$@"
 			;;
+		runit)
+			sudocmd sv status "$SERVICE"
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -854,6 +892,9 @@ serv_stop()
 		systemd)
 			sudocmd systemctl stop $SERVICE "$@"
 			;;
+		runit)
+			sudocmd sv down "$SERVICE"
+			;;
 		*)
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
@@ -869,19 +910,13 @@ serv_try_restart()
 	shift
 
 	case $SERVICETYPE in
-		service-chkconfig|service-upstart)
-			is_service_running $SERVICE || return 0
-			docmd serv $SERVICE restart "$@"
-			;;
-		service-initd|service-update)
-			is_service_running $SERVICE || return 0
-			sudocmd $INITDIR/$SERVICE restart "$@"
-			;;
 		systemd)
 			sudocmd systemctl try-restart $SERVICE "$@"
 			;;
 		*)
-			fatal "Have no suitable command for $SERVICETYPE"
+			info "Fallback to restart..."
+			is_service_running $SERVICE || { info "Service $SERVICE is not running, restart skipping…" ; return 0 ; }
+			serv_restart "$SERVICE" "$@"
 			;;
 	esac
 }
@@ -922,8 +957,8 @@ _print_additional_usage
 internal_distr_info()
 {
 # Author: Vitaly Lipatov <lav@etersoft.ru>
-# 2007, 2009, 2010, 2012 (c) Etersoft
-# 2007 Public domain
+# 2007, 2009, 2010, 2012, 2016 (c) Etersoft
+# 2007-2016 Public domain
 
 # Detect the distro and version
 # Welcome to send updates!
@@ -954,6 +989,7 @@ rpmvendor()
 	[ "$DISTRIB_ID" = "AstraLinux" ] && echo "astra" && return
 	[ "$DISTRIB_ID" = "LinuxXP" ] && echo "lxp" && return
 	[ "$DISTRIB_ID" = "TinyCoreLinux" ] && echo "tcl" && return
+	[ "$DISTRIB_ID" = "VoidLinux" ] && echo "void" && return
 	echo "$DISTRIB_ID" | tr "[A-Z]" "[a-z]"
 }
 
@@ -977,6 +1013,7 @@ pkgtype()
 		android) echo "apk" ;;
 		alpine) echo "apk" ;;
 		tinycorelinux) echo "tcz" ;;
+		voidlinux) echo "xbps" ;;
 		cygwin) echo "tar.xz" ;;
 		debian|ubuntu|mint|runtu|mcst|astra) echo "deb" ;;
 		alt|asplinux|suse|mandriva|rosa|mandrake|pclinux|sled|sles)
@@ -1036,10 +1073,6 @@ if distro altlinux-release ; then
 	elif has Citron   ; then DISTRIB_RELEASE="2.4"
 	fi
 
-elif [ `uname -o` = "Cygwin" ] ; then
-        DISTRIB_ID="Cygwin"
-        DISTRIB_RELEASE="all"
-
 elif distro gentoo-release ; then
 	DISTRIB_ID="Gentoo"
 	MAKEPROFILE=$(readlink $ROOTDIR/etc/portage/make.profile 2>/dev/null) || MAKEPROFILE=$(readlink $ROOTDIR/etc/make.profile)
@@ -1069,6 +1102,11 @@ elif distro os-release && which tce-ab 2>/dev/null >/dev/null ; then
 	DISTRIB_ID="TinyCoreLinux"
 	DISTRIB_RELEASE="$VERSION_ID"
 
+elif distro os-release && which xbps-query 2>/dev/null >/dev/null ; then
+	. $ROOTDIR/etc/os-release
+	DISTRIB_ID="VoidLinux"
+	DISTRIB_RELEASE="Live"
+
 elif distro arch-release ; then
 	DISTRIB_ID="ArchLinux"
 	DISTRIB_RELEASE="2010"
@@ -1196,7 +1234,7 @@ elif [ `uname` = "SunOS" ] ; then
 	DISTRIB_RELEASE=$(uname -r)
 
 # fixme: can we detect by some file?
-elif [ `uname` = "Darwin" ] ; then
+elif [ `uname -s 2>/dev/null` = "Darwin" ] ; then
 	DISTRIB_ID="MacOS"
 	DISTRIB_RELEASE=$(uname -r)
 
@@ -1210,6 +1248,10 @@ elif [ `uname` = "Linux" ] && [ -x $ROOTDIR/system/bin/getprop ] ; then
 	DISTRIB_ID="Android"
 	DISTRIB_RELEASE=$(getprop | awk -F": " '/build.version.release/ { print $2 }' | tr -d '[]')
 
+elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then
+        DISTRIB_ID="Cygwin"
+        DISTRIB_RELEASE="all"
+
 # try use standart LSB info by default
 elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then
 	# use LSB
@@ -1255,7 +1297,7 @@ case $1 in
 		exit 0
 		;;
 	-V)
-		echo "20120519"
+		echo "20160822"
 		exit 0
 		;;
 	*)
@@ -1403,6 +1445,9 @@ case $DISTRNAME in
 	Fedora|LinuxXP|ASPLinux|CentOS|RHEL|Scientific)
 		CMD="service-chkconfig"
 		;;
+	VoidLinux)
+		CMD="runit"
+		;;
 	Slackware)
 		CMD="service-initd"
 		;;
@@ -1433,6 +1478,7 @@ ANYSERVICE=$(which anyservice 2>/dev/null)
 is_anyservice()
 {
 	[ -n "$ANYSERVICE" ] || return
+	[ -n "$1" ] || return
 	# check if anyservice is exists and checkd returns true
 	$ANYSERVICE "$1" checkd 2>/dev/null
 }
@@ -1452,7 +1498,7 @@ $(get_help HELPOPT)
 
 print_version()
 {
-        echo "Service manager version 1.9.1"
+        echo "Service manager version 1.9.3"
         echo "Running on $($DISTRVENDOR)"
         echo "Copyright (c) Etersoft 2012, 2013, 2016"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."