Skip to content

E
eepm
Commit 317be851 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

update packed version

parent 0848810a
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 71 deletions
packed/epm.sh
View file @ 317be851
...@@ -134,15 +134,6 @@ filter_strip_spaces() ...@@ -134,15 +134,6 @@ filter_strip_spaces()
sed -e "s|^ ||" | sed -e "s| \$||" sed -e "s|^ ||" | sed -e "s| \$||"
} }
filter_pkg_verel()
{
case $PKGFORMAT in
*)
cat
;;
esac
}
strip_spaces() strip_spaces()
{ {
echo "$*" | filter_strip_spaces echo "$*" | filter_strip_spaces
...@@ -195,7 +186,7 @@ set_pm_type() ...@@ -195,7 +186,7 @@ set_pm_type()
# Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR # Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
DISTRVENDOR=internal_distr_info DISTRVENDOR=internal_distr_info
[ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) [ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) || fatal "Can't get distro name."
[ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v) [ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v)
set_target_pkg_env set_target_pkg_env
...@@ -239,6 +230,12 @@ case $DISTRNAME in ...@@ -239,6 +230,12 @@ case $DISTRNAME in
Windows) Windows)
CMD="chocolatey" CMD="chocolatey"
;; ;;
MacOS)
CMD="homebrew"
;;
OpenWRT)
CMD="ipkg"
;;
*) *)
fatal "Do not known DISTRNAME $DISTRNAME" fatal "Do not known DISTRNAME $DISTRNAME"
;; ;;
...@@ -692,6 +689,9 @@ case $PMTYPE in ...@@ -692,6 +689,9 @@ case $PMTYPE in
slackpkg) slackpkg)
docmd /usr/sbin/slackpkg info $pkg_names docmd /usr/sbin/slackpkg info $pkg_names
;; ;;
ipkg)
docmd ipkg info $pkg_names
;;
*) *)
fatal "Do not known command for $PMTYPE" fatal "Do not known command for $PMTYPE"
;; ;;
...@@ -701,16 +701,11 @@ esac ...@@ -701,16 +701,11 @@ esac
# File bin/epm-install: # File bin/epm-install:
filter_out_installed_packages() filter_out_installed_packages()
{ {
[ -z "$skip_installed" ] && cat && return [ -z "$skip_installed" ] && cat && return
# TODO: rewrite with use is_installed
# TODO: use this more effectively way
#for i in $(cat) ; do
# rpm -q $i >/dev/null && continue
# echo $i
#done |
case $PKGFORMAT in case $PKGFORMAT in
"rpm") "rpm")
LANG=C LC_ALL=C xargs -n1 rpm -q 2>&1 | grep 'is not installed' | LANG=C LC_ALL=C xargs -n1 rpm -q 2>&1 | grep 'is not installed' |
...@@ -721,7 +716,9 @@ filter_out_installed_packages() ...@@ -721,7 +716,9 @@ filter_out_installed_packages()
sed -e 's|^.*no packages found matching \(.*\)|\1|g' sed -e 's|^.*no packages found matching \(.*\)|\1|g'
;; ;;
*) *)
cat for i in $(cat) ; do
is_installed $i || echo $i
done
;; ;;
esac | sed -e "s|rpm-build-altlinux-compat[^ ]*||g" | filter_strip_spaces esac | sed -e "s|rpm-build-altlinux-compat[^ ]*||g" | filter_strip_spaces
} }
...@@ -752,7 +749,7 @@ epm_install_names() ...@@ -752,7 +749,7 @@ epm_install_names()
sudocmd emerge -uD $@ sudocmd emerge -uD $@
return ;; return ;;
pacman) pacman)
sudocmd pacman -S $@ sudocmd pacman -S $force $nodeps $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum $YUMOPTIONS install $@ sudocmd yum $YUMOPTIONS install $@
...@@ -767,8 +764,19 @@ epm_install_names() ...@@ -767,8 +764,19 @@ epm_install_names()
sudocmd mpkg install $@ sudocmd mpkg install $@
return ;; return ;;
slackpkg) slackpkg)
separate_installed $@
# TODO: use upgrade if package is already installed # TODO: use upgrade if package is already installed
sudocmd /usr/sbin/slackpkg install $@ [ -n "$pkg_noninstalled" ] && sudocmd /usr/sbin/slackpkg install $pkg_noninstalled
[ -n "$pkg_installed" ] && sudocmd /usr/sbin/slackpkg upgrade $pkg_installed
return ;;
homebrew)
separate_installed $@
[ -n "$pkg_noninstalled" ] && sudocmd brew install $pkg_noninstalled
[ -n "$pkg_installed" ] && sudocmd brew upgrade $pkg_installed
return ;;
ipkg)
[ -n "$force" ] && force=-force-depends
sudocmd ipkg $force install $@
return ;; return ;;
*) *)
fatal "Do not known install command for $PMTYPE" fatal "Do not known install command for $PMTYPE"
...@@ -797,7 +805,7 @@ epm_ni_install_names() ...@@ -797,7 +805,7 @@ epm_ni_install_names()
sudocmd pkg_add -r $@ sudocmd pkg_add -r $@
return ;; return ;;
pacman) pacman)
sudocmd pacman -S --noconfirm $@ sudocmd pacman -S --noconfirm $force $nodeps $@
return ;; return ;;
npackd) npackd)
# npackdcl update --package=<package> (remove old and install new) # npackdcl update --package=<package> (remove old and install new)
...@@ -806,6 +814,9 @@ epm_ni_install_names() ...@@ -806,6 +814,9 @@ epm_ni_install_names()
chocolatey) chocolatey)
docmd chocolatey install $@ docmd chocolatey install $@
return ;; return ;;
ipkg)
sudocmd ipkg -force-defaults install $@
return ;;
slackpkg) slackpkg)
# TODO: use upgrade if package is already installed # TODO: use upgrade if package is already installed
sudocmd /usr/sbin/slackpkg -batch=on -default_answer=yes install $@ sudocmd /usr/sbin/slackpkg -batch=on -default_answer=yes install $@
...@@ -871,7 +882,9 @@ epm_install_files() ...@@ -871,7 +882,9 @@ epm_install_files()
sudocmd pkg_add $@ sudocmd pkg_add $@
return ;; return ;;
pacman) pacman)
sudocmd pacman -U --noconfirm $@ sudocmd pacman -U --noconfirm $force $nodeps $@ && return
[ -n "$nodeps" ] && return
sudocmd pacman -U $force $@
return ;; return ;;
slackpkg) slackpkg)
sudocmd /sbin/installpkg $@ sudocmd /sbin/installpkg $@
...@@ -895,7 +908,7 @@ epm_print_install_command() ...@@ -895,7 +908,7 @@ epm_print_install_command()
echo "pkg_add $@" echo "pkg_add $@"
;; ;;
pacman) pacman)
echo "pacman -U --noconfirm $@" echo "pacman -U --noconfirm --force $nodeps $@"
;; ;;
slackpkg) slackpkg)
echo "/sbin/installpkg $@" echo "/sbin/installpkg $@"
...@@ -903,6 +916,9 @@ epm_print_install_command() ...@@ -903,6 +916,9 @@ epm_print_install_command()
npackd) npackd)
echo "npackdcl add --package=$@" echo "npackdcl add --package=$@"
;; ;;
ipkg)
echo "ipkg install $@"
;;
*) *)
fatal "Do not known appropriate install command for $PMTYPE" fatal "Do not known appropriate install command for $PMTYPE"
;; ;;
...@@ -928,6 +944,25 @@ epm_install() ...@@ -928,6 +944,25 @@ epm_install()
epm_install_files $files epm_install_files $files
} }
# File bin/epm-kernel_update:
epm_kernel_update()
{
echo "Start update system kernel to the latest version"
case $DISTRNAME in
ALTLinux)
sudocmd update-kernel
return ;;
esac
case $PMTYPE in
*)
fatal "Do not known command for $PMTYPE"
;;
esac
}
# File bin/epm-packages: # File bin/epm-packages:
epm_packages() epm_packages()
...@@ -954,7 +989,11 @@ case $PMTYPE in ...@@ -954,7 +989,11 @@ case $PMTYPE in
CMD="pkg_info" CMD="pkg_info"
;; ;;
pacman) pacman)
CMD="pacman -Qs" CMD="pacman -Qs $pkg_filenames"
if [ -n "$short" ] ; then
docmd $CMD | sed -e "s| .*||g" -e "s|.*/||g" | grep -v "^$"
return
fi
;; ;;
npackd) npackd)
CMD="npackdcl list" CMD="npackdcl list"
...@@ -962,6 +1001,12 @@ case $PMTYPE in ...@@ -962,6 +1001,12 @@ case $PMTYPE in
slackpkg) slackpkg)
CMD="ls -1 /var/log/packages/" CMD="ls -1 /var/log/packages/"
;; ;;
homebrew)
CMD="brew $pkg_filenames"
;;
ipkg)
CMD="ipkg list"
;;
*) *)
fatal "Do not known query command for $PMTYPE" fatal "Do not known query command for $PMTYPE"
;; ;;
...@@ -979,6 +1024,7 @@ epm_programs() ...@@ -979,6 +1024,7 @@ epm_programs()
local DESKTOPDIR=/usr/share/applications local DESKTOPDIR=/usr/share/applications
[ -d "$DESKTOPDIR" ] || fatal "There is no $DESKTOPDIR dir on the system." [ -d "$DESKTOPDIR" ] || fatal "There is no $DESKTOPDIR dir on the system."
#find /usr/share/applications -type f -name "*.desktop" | while read f; do pkg_files="$f" quiet=1 short=1 epm_query_file ; done | sort -u #find /usr/share/applications -type f -name "*.desktop" | while read f; do pkg_files="$f" quiet=1 short=1 epm_query_file ; done | sort -u
showcmd "find /usr/share/applications -type f -name "*.desktop" | xargs $0 -qf --quiet --short | sort -u"
find /usr/share/applications -type f -name "*.desktop" | \ find /usr/share/applications -type f -name "*.desktop" | \
xargs $0 -qf --quiet --short | sort -u xargs $0 -qf --quiet --short | sort -u
} }
...@@ -992,9 +1038,10 @@ _query_via_packages_list() ...@@ -992,9 +1038,10 @@ _query_via_packages_list()
local res=0 local res=0
local firstpkg=$1 local firstpkg=$1
shift shift
epm_packages | grep -- "$firstpkg-" || res=1 # separate first line for print out command
short=1 pkg_filenames=$firstpkg epm_packages | grep -- "^$firstpkg$" || res=1
for pkg in "$@" ; do for pkg in "$@" ; do
epm_packages 2>/dev/null | grep -- "$pkg-" || res=1 short=1 pkg_filenames=$pkg epm_packages 2>/dev/null | grep -- "^$pkg$" || res=1
done done
return $res return $res
} }
...@@ -1006,7 +1053,7 @@ __epm_query_file() ...@@ -1006,7 +1053,7 @@ __epm_query_file()
[ -z "$*" ] && return [ -z "$*" ] && return
case $PMTYPE in case $PMTYPE in
apt-rpm|yum-rpm|urpm-rpm|zypper-rpm) *-rpm)
CMD="rpm -qp" CMD="rpm -qp"
;; ;;
apt-dpkg) apt-dpkg)
...@@ -1031,7 +1078,7 @@ __epm_query_name() ...@@ -1031,7 +1078,7 @@ __epm_query_name()
[ -z "$*" ] && return [ -z "$*" ] && return
case $PMTYPE in case $PMTYPE in
apt-rpm|yum-rpm|urpm-rpm|zypper-rpm) *-rpm)
CMD="rpm -q" CMD="rpm -q"
;; ;;
apt-dpkg) apt-dpkg)
...@@ -1044,6 +1091,10 @@ __epm_query_name() ...@@ -1044,6 +1091,10 @@ __epm_query_name()
npackd) npackd)
CMD="npackdcl path --package=$@" CMD="npackdcl path --package=$@"
;; ;;
brew)
warning "fix query"
return 1
;;
*) *)
_query_via_packages_list $@ _query_via_packages_list $@
return return
...@@ -1055,7 +1106,17 @@ __epm_query_name() ...@@ -1055,7 +1106,17 @@ __epm_query_name()
is_installed() is_installed()
{ {
pkg_filenames="$@" epm_query >/dev/null #pkg_filenames="$@" epm_query >/dev/null
epm installed $@ >/dev/null
}
separate_installed()
{
pkg_installed=
pkg_noninstalled=
for i in $* ; do
is_installed $i && pkg_installed="$pkg_installed $i" || pkg_noninstalled="$pkg_noninstalled $i"
done
} }
epm_query() epm_query()
...@@ -1119,7 +1180,7 @@ __do_query() ...@@ -1119,7 +1180,7 @@ __do_query()
;; ;;
apt-dpkg) apt-dpkg)
showcmd dpkg -S $1 showcmd dpkg -S $1
dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||") dpkg_print_name_version $(dpkg -S $1 | grep -v "^diversion by" | sed -e "s|:.*||")
return ;; return ;;
yum-rpm|urpm-rpm) yum-rpm|urpm-rpm)
CMD="rpm -qf" CMD="rpm -qf"
...@@ -1138,6 +1199,9 @@ __do_query() ...@@ -1138,6 +1199,9 @@ __do_query()
docmd grep -R -- "$(echo $@ | sed -e 's|^/\+||g')" /var/log/packages | sed -e "s|/var/log/packages/||g" docmd grep -R -- "$(echo $@ | sed -e 's|^/\+||g')" /var/log/packages | sed -e "s|/var/log/packages/||g"
return return
;; ;;
ipkg)
CMD="ipkg files"
;;
*) *)
fatal "Do not known query command for $PMTYPE" fatal "Do not known query command for $PMTYPE"
;; ;;
...@@ -1156,7 +1220,7 @@ __do_short_query() ...@@ -1156,7 +1220,7 @@ __do_short_query()
;; ;;
NOapt-dpkg) NOapt-dpkg)
showcmd dpkg -S $1 showcmd dpkg -S $1
dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||") dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||" | grep -v "^diversion by")
return ;; return ;;
NOemerge) NOemerge)
CMD="equery belongs" CMD="equery belongs"
...@@ -1209,6 +1273,7 @@ epm_query_package() ...@@ -1209,6 +1273,7 @@ epm_query_package()
# File bin/epm-reinstall: # File bin/epm-reinstall:
epm_reinstall_names() epm_reinstall_names()
{ {
[ -n "$1" ] || return [ -n "$1" ] || return
...@@ -1216,31 +1281,16 @@ epm_reinstall_names() ...@@ -1216,31 +1281,16 @@ epm_reinstall_names()
apt-rpm|apt-dpkg) apt-rpm|apt-dpkg)
sudocmd apt-get --reinstall install $@ sudocmd apt-get --reinstall install $@
return ;; return ;;
yum-rpm)
sudocmd yum install $@
return ;;
dnf-rpm) dnf-rpm)
sudocmd dnf reinstall $@ sudocmd dnf reinstall $@
return ;; return ;;
urpm-rpm)
sudocmd urpmi $@
return ;;
zypper-rpm)
sudocmd zypper install $@
return ;;
pkgsrc)
sudocmd pkg_add -r $@
return ;;
pacman)
sudocmd pacman -U $@
return ;;
slackpkg) slackpkg)
sudocmd /usr/sbin/slackpkg reinstall $@ sudocmd /usr/sbin/slackpkg reinstall $@
return ;; return ;;
*)
fatal "Do not known install command for $PMTYPE"
;;
esac esac
# fallback to generic install
epm_install_names
} }
epm_reinstall_files() epm_reinstall_files()
...@@ -1316,7 +1366,7 @@ epm_release_upgrade() ...@@ -1316,7 +1366,7 @@ epm_release_upgrade()
docmd epm upgrade docmd epm upgrade
;; ;;
pacman) pacman)
#epm upgrade epm Upgrade
;; ;;
*) *)
fatal "Do not known command for $PMTYPE" fatal "Do not known command for $PMTYPE"
...@@ -1336,7 +1386,8 @@ epm_remove_low() ...@@ -1336,7 +1386,8 @@ epm_remove_low()
sudocmd rpm -ev $nodeps $@ sudocmd rpm -ev $nodeps $@
return ;; return ;;
apt-dpkg) apt-dpkg)
sudocmd dpkg -P $@ [ -n "$nodeps" ] && nodeps="--force-all"
sudocmd dpkg -P $nodeps $@
return ;; return ;;
pkgsrc) pkgsrc)
sudocmd pkg_delete -r $@ sudocmd pkg_delete -r $@
...@@ -1376,7 +1427,7 @@ epm_remove_names() ...@@ -1376,7 +1427,7 @@ epm_remove_names()
sudocmd emerge -aC $@ sudocmd emerge -aC $@
return ;; return ;;
pacman) pacman)
sudocmd pacman -Rs $@ sudocmd pacman -Rc $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum remove $@ sudocmd yum remove $@
...@@ -1399,6 +1450,13 @@ epm_remove_names() ...@@ -1399,6 +1450,13 @@ epm_remove_names()
slackpkg) slackpkg)
sudocmd /usr/sbin/slackpkg remove $@ sudocmd /usr/sbin/slackpkg remove $@
return ;; return ;;
homebrew)
sudocmd brew remove $@
return ;;
ipkg)
[ -n "$force" ] && force=-force-depends
sudocmd ipkg $force remove $@
return ;;
*) *)
fatal "Do not known command for $PMTYPE" fatal "Do not known command for $PMTYPE"
;; ;;
...@@ -1415,7 +1473,7 @@ epm_remove_nonint() ...@@ -1415,7 +1473,7 @@ epm_remove_nonint()
sudocmd urpme --auto $@ sudocmd urpme --auto $@
return ;; return ;;
pacman) pacman)
sudocmd pacman -Rs --noconfirm $@ sudocmd pacman -Rc --noconfirm $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y remove $@ sudocmd yum -y remove $@
...@@ -1426,6 +1484,9 @@ epm_remove_nonint() ...@@ -1426,6 +1484,9 @@ epm_remove_nonint()
slackpkg) slackpkg)
sudocmd /usr/sbin/slackpkg -batch=on -default_answer=yes remove $@ sudocmd /usr/sbin/slackpkg -batch=on -default_answer=yes remove $@
return ;; return ;;
ipkg)
sudocmd ipkg -force-defaults remove $@
return ;;
esac esac
return 5 return 5
} }
...@@ -1451,6 +1512,9 @@ epm_print_remove_command() ...@@ -1451,6 +1512,9 @@ epm_print_remove_command()
slackpkg) slackpkg)
echo "/sbin/removepkg $@" echo "/sbin/removepkg $@"
;; ;;
ipkg)
echo "ipkg remove $@"
;;
*) *)
fatal "Do not known appropriate remove command for $PMTYPE" fatal "Do not known appropriate remove command for $PMTYPE"
;; ;;
...@@ -1470,9 +1534,6 @@ epm_remove() ...@@ -1470,9 +1534,6 @@ epm_remove()
[ -n "$pkg_filenames" ] || fatal "Run remove without args" [ -n "$pkg_filenames" ] || fatal "Run remove without args"
epm_remove_low $pkg_filenames && return epm_remove_low $pkg_filenames && return
# FIXME: needs only for apt
pkg_filenames=$(echo $pkg_filenames | filter_pkg_verel)
if [ -n "$non_interactive" ] ; then if [ -n "$non_interactive" ] ; then
epm_remove_nonint $pkg_filenames epm_remove_nonint $pkg_filenames
local RET=$? local RET=$?
...@@ -1672,6 +1733,9 @@ case $PMTYPE in ...@@ -1672,6 +1733,9 @@ case $PMTYPE in
docmd_foreach "/usr/sbin/slackpkg search" $pkg_filenames docmd_foreach "/usr/sbin/slackpkg search" $pkg_filenames
return return
;; ;;
homebrew)
CMD="brew search"
;;
*) *)
fatal "Do not known search command for $PMTYPE" fatal "Do not known search command for $PMTYPE"
;; ;;
...@@ -1735,6 +1799,9 @@ case $PMTYPE in ...@@ -1735,6 +1799,9 @@ case $PMTYPE in
slackpkg) slackpkg)
CMD="/usr/sbin/slackpkg file-search" CMD="/usr/sbin/slackpkg file-search"
;; ;;
ipkg)
CMD="ipkg search"
;;
*) *)
fatal "Do not known search file command for $PMTYPE" fatal "Do not known search file command for $PMTYPE"
;; ;;
...@@ -1752,19 +1819,34 @@ __use_zypper_dry_run() ...@@ -1752,19 +1819,34 @@ __use_zypper_dry_run()
a= zypper install --help 2>&1 | grep -q -- "--dry-run" && echo "--dry-run" a= zypper install --help 2>&1 | grep -q -- "--dry-run" && echo "--dry-run"
} }
__use_yum_assumeno()
{
a= yum --help 2>&1 | grep -q -- "--assumeno"
}
_epm_do_simulate() _epm_do_simulate()
{ {
local CMD local CMD
local filenames=$@ local filenames="$*"
case $PMTYPE in case $PMTYPE in
apt-rpm|apt-dpkg) apt-rpm|apt-dpkg)
CMD="apt-get --simulate install" CMD="apt-get --simulate install"
;; ;;
yum-rpm) yum-rpm)
if __use_yum_assumeno ; then
LC_ALL=C sudocmd yum --assumeno install $filenames LC_ALL=C sudocmd yum --assumeno install $filenames
# FIXME: check only error output # FIXME: check only error output
LC_ALL=C sudocmd yum --assumeno install $filenames 2>&1 | grep "^No package" && return 1 LC_ALL=C sudocmd yum --assumeno install $filenames 2>&1 | grep "^No package" && return 1
LC_ALL=C sudocmd yum --assumeno install $filenames 2>&1 | grep "^Complete!" && return 0
LC_ALL=C sudocmd yum --assumeno install $filenames >/dev/null 2>&1 || return
else
LC_ALL=C echo n | sudocmd yum install $filenames
# FIXME: check only error output
LC_ALL=C echo n | sudocmd yum install $filenames 2>&1 | grep "^No package" && return 1
LC_ALL=C echo n | sudocmd yum install $filenames 2>&1 | grep "^Complete!" && return 0
LC_ALL=C echo n | sudocmd yum install $filenames >/dev/null 2>&1 || return
fi
return 0 ;; return 0 ;;
urpm-rpm) urpm-rpm)
CMD="urpmi --test --auto" CMD="urpmi --test --auto"
...@@ -1859,6 +1941,12 @@ case $PMTYPE in ...@@ -1859,6 +1941,12 @@ case $PMTYPE in
deepsolver-rpm) deepsolver-rpm)
sudocmd ds-update sudocmd ds-update
;; ;;
homebrew)
sudocmd brew update
;;
ipkg)
sudocmd ipkg update
;;
*) *)
fatal "Do not known update command for $PMTYPE" fatal "Do not known update command for $PMTYPE"
;; ;;
...@@ -1903,6 +1991,12 @@ epm_upgrade() ...@@ -1903,6 +1991,12 @@ epm_upgrade()
chocolatey) chocolatey)
CMD="chocolatey update all" CMD="chocolatey update all"
;; ;;
homebrew)
CMD="brew upgrade"
;;
ipkg)
CMD="ipkg upgrade"
;;
slackpkg) slackpkg)
CMD="/usr/sbin/slackpkg upgrade-all" CMD="/usr/sbin/slackpkg upgrade-all"
;; ;;
...@@ -1980,7 +2074,7 @@ pkgtype() ...@@ -1980,7 +2074,7 @@ pkgtype()
freebsd) echo "tbz" ;; freebsd) echo "tbz" ;;
sunos) echo "pkg.gz" ;; sunos) echo "pkg.gz" ;;
slackware|mopslinux) echo "tgz" ;; slackware|mopslinux) echo "tgz" ;;
archlinux) echo "tar.xz" ;; archlinux) echo "pkg.tar.xz" ;;
gentoo) echo "tbz2" ;; gentoo) echo "tbz2" ;;
windows) echo "exe" ;; windows) echo "exe" ;;
debian|ubuntu|mint|runtu) echo "deb" ;; debian|ubuntu|mint|runtu) echo "deb" ;;
...@@ -2246,7 +2340,7 @@ $(get_help HELPOPT) ...@@ -2246,7 +2340,7 @@ $(get_help HELPOPT)
print_version() print_version()
{ {
echo "EPM package manager version 1.1.9" echo "EPM package manager version 1.2.1"
echo "Running on $($DISTRVENDOR) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)" echo "Running on $($DISTRVENDOR) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2013" echo "Copyright (c) Etersoft 2012-2013"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
...@@ -2379,6 +2473,9 @@ check_command() ...@@ -2379,6 +2473,9 @@ check_command()
release-upgrade) # HELPCMD: update whole system to the next release release-upgrade) # HELPCMD: update whole system to the next release
epm_cmd=release_upgrade epm_cmd=release_upgrade
;; ;;
kernel-update|kernel-upgrade|update-kernel) # HELPCMD: update system kernel to the last repo version
epm_cmd=kernel_update
;;
# Other commands # Other commands
clean) # HELPCMD: clean local package cache clean) # HELPCMD: clean local package cache
......
packed/serv.sh
View file @ 317be851
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
# #
PROGDIR=$(dirname $0) PROGDIR=$(dirname $0)
[ "$PROGDIR" = "." ] && PROGDIR=$(pwd)
# will replaced to /usr/share/eepm during install # will replaced to /usr/share/eepm during install
SHAREDIR=$(dirname $0) SHAREDIR=$(dirname $0)
...@@ -130,15 +132,6 @@ filter_strip_spaces() ...@@ -130,15 +132,6 @@ filter_strip_spaces()
sed -e "s|^ ||" | sed -e "s| \$||" sed -e "s|^ ||" | sed -e "s| \$||"
} }
filter_pkg_verel()
{
case $PKGFORMAT in
*)
cat
;;
esac
}
strip_spaces() strip_spaces()
{ {
echo "$*" | filter_strip_spaces echo "$*" | filter_strip_spaces
...@@ -191,7 +184,7 @@ set_pm_type() ...@@ -191,7 +184,7 @@ set_pm_type()
# Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR # Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
DISTRVENDOR=internal_distr_info DISTRVENDOR=internal_distr_info
[ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) [ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) || fatal "Can't get distro name."
[ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v) [ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v)
set_target_pkg_env set_target_pkg_env
...@@ -235,6 +228,12 @@ case $DISTRNAME in ...@@ -235,6 +228,12 @@ case $DISTRNAME in
Windows) Windows)
CMD="chocolatey" CMD="chocolatey"
;; ;;
MacOS)
CMD="homebrew"
;;
OpenWRT)
CMD="ipkg"
;;
*) *)
fatal "Do not known DISTRNAME $DISTRNAME" fatal "Do not known DISTRNAME $DISTRNAME"
;; ;;
...@@ -588,7 +587,7 @@ pkgtype() ...@@ -588,7 +587,7 @@ pkgtype()
freebsd) echo "tbz" ;; freebsd) echo "tbz" ;;
sunos) echo "pkg.gz" ;; sunos) echo "pkg.gz" ;;
slackware|mopslinux) echo "tgz" ;; slackware|mopslinux) echo "tgz" ;;
archlinux) echo "tar.xz" ;; archlinux) echo "pkg.tar.xz" ;;
gentoo) echo "tbz2" ;; gentoo) echo "tbz2" ;;
windows) echo "exe" ;; windows) echo "exe" ;;
debian|ubuntu|mint|runtu) echo "deb" ;; debian|ubuntu|mint|runtu) echo "deb" ;;
...@@ -848,7 +847,7 @@ set_service_type() ...@@ -848,7 +847,7 @@ set_service_type()
# Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR # Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
DISTRVENDOR=internal_distr_info DISTRVENDOR=internal_distr_info
[ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) [ -n "$DISTRNAME" ] || DISTRNAME=$($DISTRVENDOR -d) || fatal "Can't get distro name."
[ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v) [ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v)
set_target_pkg_env set_target_pkg_env
...@@ -921,7 +920,7 @@ $(get_help HELPOPT) ...@@ -921,7 +920,7 @@ $(get_help HELPOPT)
print_version() print_version()
{ {
echo "Service manager version 1.1.9" echo "Service manager version 1.2.1"
echo "Running on $($DISTRVENDOR)" echo "Running on $($DISTRVENDOR)"
echo "Copyright (c) Etersoft 2012, 2013" echo "Copyright (c) Etersoft 2012, 2013"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment