Skip to content

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

commit packed 3.64.11

parent feff5ff6
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 39 deletions
packed/epm.sh
View file @ aa39ee7f
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
PROGDIR=$(dirname "$0") PROGDIR="$(dirname "$0")"
PROGNAME=$(basename "$0") PROGNAME="$(basename "$0")"
[ -n "$EPMCURDIR" ] || export EPMCURDIR="$(pwd)" [ -n "$EPMCURDIR" ] || export EPMCURDIR="$(pwd)"
CMDENV="/usr/bin/env" CMDENV="/usr/bin/env"
[ -x "$CMDENV" ] && CMDSHELL="/usr/bin/env bash" || CMDSHELL="$SHELL" [ -x "$CMDENV" ] && CMDSHELL="/usr/bin/env bash" || CMDSHELL="$SHELL"
...@@ -30,11 +30,11 @@ if [ "$0" = "/dev/stdin" ] || [ "$0" = "sh" ] ; then ...@@ -30,11 +30,11 @@ if [ "$0" = "/dev/stdin" ] || [ "$0" = "sh" ] ; then
fi fi
# will replaced with /usr/share/eepm during install # will replaced with /usr/share/eepm during install
SHAREDIR=$PROGDIR SHAREDIR="$PROGDIR"
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR="$PROGDIR/../etc"
export EPMVERSION="3.64.10" export EPMVERSION="3.64.11"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -43,14 +43,14 @@ EPMMODE="package" ...@@ -43,14 +43,14 @@ EPMMODE="package"
[ "$PROGNAME" = "" ] && EPMMODE="pipe" [ "$PROGNAME" = "" ] && EPMMODE="pipe"
if [ "$EPMMODE" = "git" ] ; then if [ "$EPMMODE" = "git" ] ; then
EPMVERSION=$(head $PROGDIR/../eepm.spec | grep "^Version: " | sed -e 's|Version: ||' ) EPMVERSION="$(head "$PROGDIR/../eepm.spec" | grep "^Version: " | sed -e 's|Version: ||' )"
fi fi
load_helper() load_helper()
{ {
local shieldname="loaded$(echo "$1" | sed -e 's|-||g')" local shieldname="loaded$(echo "$1" | sed -e 's|-||g')"
# already loaded # already loaded
eval "[ -n \"\$$shieldname\" ]" && debug 'Already loaded $1' && return eval "[ -n \"\$$shieldname\" ]" && debug 'Already loaded' $1 && return
local CMD="$SHAREDIR/$1" local CMD="$SHAREDIR/$1"
# do not use fatal() here, it can be initial state # do not use fatal() here, it can be initial state
...@@ -747,7 +747,7 @@ disabled_eget() ...@@ -747,7 +747,7 @@ disabled_eget()
{ {
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_eget ] ; then if [ -s $SHAREDIR/tools_eget ] ; then
( EGET_BACKEND=$eget_backend $CMDSHELL $SHAREDIR/tools_eget "$@" ) ( EGET_BACKEND="$eget_backend" $CMDSHELL "$SHAREDIR"/tools_eget "$@" )
return return
fi fi
fatal "Internal error: missed tools_eget" fatal "Internal error: missed tools_eget"
...@@ -777,8 +777,8 @@ disabled_erc() ...@@ -777,8 +777,8 @@ disabled_erc()
__epm_assure_7zip __epm_assure_7zip
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_erc ] ; then if [ -s "$SHAREDIR"/tools_erc ] ; then
$CMDSHELL $SHAREDIR/tools_erc "$@" $CMDSHELL "$SHAREDIR"/tools_erc "$@"
return return
fi fi
fatal "Internal error: missed tools_erc" fatal "Internal error: missed tools_erc"
...@@ -795,8 +795,8 @@ disabled_ercat() ...@@ -795,8 +795,8 @@ disabled_ercat()
{ {
local ERCAT local ERCAT
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_ercat ] ; then if [ -s "$SHAREDIR"/tools_ercat ] ; then
$CMDSHELL $SHAREDIR/tools_ercat "$@" $CMDSHELL "$SHAREDIR"/tools_ercat "$@"
return return
fi fi
fatal "Internal error: missed tools_ercat" fatal "Internal error: missed tools_ercat"
...@@ -810,8 +810,8 @@ disabled_ercat() ...@@ -810,8 +810,8 @@ disabled_ercat()
disabled_estrlist() disabled_estrlist()
{ {
if [ -s $SHAREDIR/tools_estrlist ] ; then if [ -s "$SHAREDIR"/tools_estrlist ] ; then
$CMDSHELL $SHAREDIR/tools_estrlist "$@" $CMDSHELL "$SHAREDIR"/tools_estrlist "$@"
return return
fi fi
fatal "missed tools_estrlist" fatal "missed tools_estrlist"
...@@ -951,7 +951,7 @@ set_distro_info() ...@@ -951,7 +951,7 @@ set_distro_info()
# don't run again in subprocesses # don't run again in subprocesses
[ -n "$DISTRVENDOR" ] && return 0 [ -n "$DISTRVENDOR" ] && return 0
DISTRVENDOR=internal_distr_info DISTRVENDOR="$PROGDIR"/distr_info
# export pack of variables, see epm print info --print-eepm-env # export pack of variables, see epm print info --print-eepm-env
[ -n "$verbose" ] && $DISTRVENDOR --print-eepm-env [ -n "$verbose" ] && $DISTRVENDOR --print-eepm-env
...@@ -964,11 +964,11 @@ set_pm_type() ...@@ -964,11 +964,11 @@ set_pm_type()
set_distro_info set_distro_info
if [ -n "$EPM_BACKEND" ] ; then if [ -n "$EPM_BACKEND" ] ; then
PMTYPE=$EPM_BACKEND PMTYPE="$EPM_BACKEND"
return return
fi fi
if [ -n "$FORCEPM" ] ; then if [ -n "$FORCEPM" ] ; then
PMTYPE=$FORCEPM PMTYPE="$FORCEPM"
return return
fi fi
...@@ -14868,7 +14868,7 @@ case $DISTRIB_ID in ...@@ -14868,7 +14868,7 @@ case $DISTRIB_ID in
PCLinux) PCLinux)
CMD="apt-rpm" CMD="apt-rpm"
;; ;;
Ubuntu|Debian|Mint|OSNovaLinux|Uncom|AstraLinux*|Elbrus) Ubuntu|Debian|Mint|OSnovaLinux|Uncom|AstraLinux*|Elbrus)
CMD="apt-dpkg" CMD="apt-dpkg"
#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg #which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
#is_command snappy && CMD=snappy #is_command snappy && CMD=snappy
...@@ -15566,26 +15566,31 @@ echo "$DIST_BIT" ...@@ -15566,26 +15566,31 @@ echo "$DIST_BIT"
get_memory_size() get_memory_size()
{ {
local detected="" local detected=""
local divider="1"
local DIST_OS="$(get_base_os_name)" local DIST_OS="$(get_base_os_name)"
case "$DIST_OS" in case "$DIST_OS" in
macosx) macosx)
detected=$((`sysctl hw.memsize | sed s/"hw.memsize: "//`/1024/1024)) detected="$(a='' sysctl hw.memsize | sed 's/hw.memsize: //')"
divider="1024/1024"
;; ;;
freebsd) freebsd)
detected=$((`sysctl hw.physmem | sed s/"hw.physmem: "//`/1024/1024)) detected="$(a='' sysctl hw.physmem | sed 's/hw.physmem: //')"
divider="1024/1024"
;; ;;
linux) linux)
[ -r /proc/meminfo ] && detected=$((`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`/1024)) detected="$(cat /proc/meminfo 2>/dev/null | grep 'MemTotal' | awk '{print $2}')"
divider="1024"
;; ;;
solaris) solaris)
detected=$(a='' prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #" detected=$(a='' prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #"
divider="1"
;; ;;
# *) # *)
# fatal "Unsupported OS $DIST_OS" # fatal "Unsupported OS $DIST_OS"
esac esac
[ -n "$detected" ] || detected=0 [ -n "$detected" ] || detected=0
echo $detected echo "$(($detected/$divider))"
} }
print_name_version() print_name_version()
...@@ -18688,7 +18693,7 @@ fi ...@@ -18688,7 +18693,7 @@ fi
epm_main() epm_main()
{ {
eget_backend=$EGET_BACKEND eget_backend="$EGET_BACKEND"
# fast call for tool # fast call for tool
if [ "$1" = "tool" ] ; then if [ "$1" = "tool" ] ; then
......
packed/serv.sh
View file @ aa39ee7f
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.64.10" EPMVERSION="3.64.11"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -744,7 +744,7 @@ disabled_eget() ...@@ -744,7 +744,7 @@ disabled_eget()
{ {
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_eget ] ; then if [ -s $SHAREDIR/tools_eget ] ; then
( EGET_BACKEND=$eget_backend $CMDSHELL $SHAREDIR/tools_eget "$@" ) ( EGET_BACKEND="$eget_backend" $CMDSHELL "$SHAREDIR"/tools_eget "$@" )
return return
fi fi
fatal "Internal error: missed tools_eget" fatal "Internal error: missed tools_eget"
...@@ -774,8 +774,8 @@ disabled_erc() ...@@ -774,8 +774,8 @@ disabled_erc()
__epm_assure_7zip __epm_assure_7zip
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_erc ] ; then if [ -s "$SHAREDIR"/tools_erc ] ; then
$CMDSHELL $SHAREDIR/tools_erc "$@" $CMDSHELL "$SHAREDIR"/tools_erc "$@"
return return
fi fi
fatal "Internal error: missed tools_erc" fatal "Internal error: missed tools_erc"
...@@ -792,8 +792,8 @@ disabled_ercat() ...@@ -792,8 +792,8 @@ disabled_ercat()
{ {
local ERCAT local ERCAT
# use internal eget only if exists # use internal eget only if exists
if [ -s $SHAREDIR/tools_ercat ] ; then if [ -s "$SHAREDIR"/tools_ercat ] ; then
$CMDSHELL $SHAREDIR/tools_ercat "$@" $CMDSHELL "$SHAREDIR"/tools_ercat "$@"
return return
fi fi
fatal "Internal error: missed tools_ercat" fatal "Internal error: missed tools_ercat"
...@@ -807,8 +807,8 @@ disabled_ercat() ...@@ -807,8 +807,8 @@ disabled_ercat()
disabled_estrlist() disabled_estrlist()
{ {
if [ -s $SHAREDIR/tools_estrlist ] ; then if [ -s "$SHAREDIR"/tools_estrlist ] ; then
$CMDSHELL $SHAREDIR/tools_estrlist "$@" $CMDSHELL "$SHAREDIR"/tools_estrlist "$@"
return return
fi fi
fatal "missed tools_estrlist" fatal "missed tools_estrlist"
...@@ -948,7 +948,7 @@ set_distro_info() ...@@ -948,7 +948,7 @@ set_distro_info()
# don't run again in subprocesses # don't run again in subprocesses
[ -n "$DISTRVENDOR" ] && return 0 [ -n "$DISTRVENDOR" ] && return 0
DISTRVENDOR=internal_distr_info DISTRVENDOR="$PROGDIR"/distr_info
# export pack of variables, see epm print info --print-eepm-env # export pack of variables, see epm print info --print-eepm-env
[ -n "$verbose" ] && $DISTRVENDOR --print-eepm-env [ -n "$verbose" ] && $DISTRVENDOR --print-eepm-env
...@@ -961,11 +961,11 @@ set_pm_type() ...@@ -961,11 +961,11 @@ set_pm_type()
set_distro_info set_distro_info
if [ -n "$EPM_BACKEND" ] ; then if [ -n "$EPM_BACKEND" ] ; then
PMTYPE=$EPM_BACKEND PMTYPE="$EPM_BACKEND"
return return
fi fi
if [ -n "$FORCEPM" ] ; then if [ -n "$FORCEPM" ] ; then
PMTYPE=$FORCEPM PMTYPE="$FORCEPM"
return return
fi fi
...@@ -1960,7 +1960,7 @@ case $DISTRIB_ID in ...@@ -1960,7 +1960,7 @@ case $DISTRIB_ID in
PCLinux) PCLinux)
CMD="apt-rpm" CMD="apt-rpm"
;; ;;
Ubuntu|Debian|Mint|OSNovaLinux|Uncom|AstraLinux*|Elbrus) Ubuntu|Debian|Mint|OSnovaLinux|Uncom|AstraLinux*|Elbrus)
CMD="apt-dpkg" CMD="apt-dpkg"
#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg #which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
#is_command snappy && CMD=snappy #is_command snappy && CMD=snappy
...@@ -2658,26 +2658,31 @@ echo "$DIST_BIT" ...@@ -2658,26 +2658,31 @@ echo "$DIST_BIT"
get_memory_size() get_memory_size()
{ {
local detected="" local detected=""
local divider="1"
local DIST_OS="$(get_base_os_name)" local DIST_OS="$(get_base_os_name)"
case "$DIST_OS" in case "$DIST_OS" in
macosx) macosx)
detected=$((`sysctl hw.memsize | sed s/"hw.memsize: "//`/1024/1024)) detected="$(a='' sysctl hw.memsize | sed 's/hw.memsize: //')"
divider="1024/1024"
;; ;;
freebsd) freebsd)
detected=$((`sysctl hw.physmem | sed s/"hw.physmem: "//`/1024/1024)) detected="$(a='' sysctl hw.physmem | sed 's/hw.physmem: //')"
divider="1024/1024"
;; ;;
linux) linux)
[ -r /proc/meminfo ] && detected=$((`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`/1024)) detected="$(cat /proc/meminfo 2>/dev/null | grep 'MemTotal' | awk '{print $2}')"
divider="1024"
;; ;;
solaris) solaris)
detected=$(a='' prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #" detected=$(a='' prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #"
divider="1"
;; ;;
# *) # *)
# fatal "Unsupported OS $DIST_OS" # fatal "Unsupported OS $DIST_OS"
esac esac
[ -n "$detected" ] || detected=0 [ -n "$detected" ] || detected=0
echo $detected echo "$(($detected/$divider))"
} }
print_name_version() print_name_version()
......
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