commit packed 3.64.38

packed/epm.sh

@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR"
 # will replaced with /etc/eepm during install
 CONFIGDIR="$PROGDIR/../etc"
 
-export EPMVERSION="3.64.37"
+export EPMVERSION="3.64.38"
 
 # package, single (file), pipe, git
 EPMMODE="package"
@@ -4258,12 +4258,12 @@ confirm_action()
     if [ "$BASEDISTRNAME" = "alt" ] ; then
         confirm_action "Do upgrade epm? [Y/n]" || full_upgrade_no_epm_update_check=1
         if [ -z "$full_upgrade_no_epm_update_check" ] ; then
-            [ -n "$quiet" ] || echo
+            [ -n "$quiet" ] || echo "Checking for new eepm package..."
             epm_version_before=$(epmq eepm &>/dev/null)
             docmd epm $dryrun install eepm &>/dev/null
             epm_version_after=$(epmq eepm &>/dev/null)
             if [ "$epm_version_before" != "$epm_version_after" ] ; then
-                info "An update for epm has been found, epm will be restarted for the update"
+                info "An update for epm has been found, restarting epm full-upgrade..."
                 exec $PROGDIR/$PROGNAME full-upgrade "$@"
                 exit 0
             fi
@@ -6097,8 +6097,16 @@ epm_list_available()
 
 
 case $PMTYPE in
-    apt-*)
+    apt-dpkg)
         warmup_dpkgbase
+        ;;
+    apt-rpm)
+        warmup_rpmbase
+        ;;
+esac
+
+case $PMTYPE in
+    apt-*)
         # TODO: use apt list
         if [ -n "$short" ] ; then
             docmd apt-cache search . | sed -e "s| .*||g"
@@ -6669,6 +6677,15 @@ __epm_pack_run_handler()
     shift 4
     returntarname=''
 
+    if is_command sha256sum ; then
+        message "sha256sum:"
+        for i in $tarname ; do
+            message "    $(sha256sum $i) $(basename $i)"
+        done
+    else
+        message "sha256sum is missed, can't print sha256 for packages..."
+    fi
+
     local repackcode="$EPM_PACK_SCRIPTS_DIR/$packname.sh"
     [ -s "$repackcode" ] || return
     [ -f "$repackcode.rpmnew" ] && warning 'There is .rpmnew file(s) in $EPM_PACK_SCRIPTS_DIR dir. The pack script can be outdated.'
@@ -6751,7 +6768,7 @@ __epm_pack()
     return 0
 }
 
-__list_all_app()
+__list_all_pack_rules()
 {
     cd $EPM_PACK_SCRIPTS_DIR || fatal
     for i in *.sh ; do
@@ -6762,15 +6779,6 @@ __list_all_app()
     cd - >/dev/null
 }
 
-__epm_pack_list()
-{
-for i in $(__list_all_app) ; do
-    echo "$i"
-done
-exit
-
-}
-
 epm_pack_help()
 {
     message '
@@ -6799,11 +6807,11 @@ case "$1" in
         return
         ;;
     --list)                        # HELPCMD: list all available receipts
-        __list_all_app
+        __list_all_pack_rules
         return
         ;;
     "")
-        fatal "Missed params. run with --help to get help."
+        fatal "Missed pack rule. run with --help to get help."
         ;;
 esac
 
@@ -6817,8 +6825,6 @@ esac
     local url=''
     shift 3
 
-    [ -n "$packname" ] || __epm_pack_list
-
     if is_url "$tarname"; then
         url="$tarname"
         pkg_urls="$tarname"
@@ -10803,6 +10809,8 @@ __prepare_source_package()
 __epm_repack_single()
 {
     local pkg="$1"
+    local packversion="$2"
+    local packrelease="$3"
     case $PKGFORMAT in
         rpm)
             if [ "$BASEDISTRNAME" = "alt" ] ; then
@@ -10813,12 +10821,12 @@ __epm_repack_single()
                     fatal_warning "Repacking already repacked package $pkg is uselessly."
                 fi
             fi
-            __epm_repack_to_rpm "$pkg" || return
+            __epm_repack_to_rpm "$pkg" "$packversion" "$packrelease" || return
             ;;
         deb)
             if __epm_have_repack_rule "$pkg" ; then
                 # we have repack rules only for rpm, so use rpm step in any case
-                __epm_repack_to_rpm "$pkg" || return
+                __epm_repack_to_rpm "$pkg" "$packversion" "$packrelease" || return
                 [ -n "$repacked_pkg" ] || return
                 __epm_repack_to_deb $repacked_pkg || return
             else
@@ -10837,8 +10845,20 @@ __epm_repack()
 {
     local pkg
     repacked_pkgs=''
+    local packversion="${EPM_REPACK_VERSION:-}"
+    local packrelease="${EPM_REPACK_RELEASE:-}"
+
+    if is_command sha256sum ; then
+        message "sha256sum:"
+        for i in $pkg_files ; do
+            message "    $(sha256sum $i) $(basename $i)"
+        done
+    else
+        message "sha256sum is missed, can't print sha256 for packages..."
+    fi
+
     for pkg in $* ; do
-        __epm_repack_single "$pkg" || fatal 'Error with $pkg repacking.'
+        __epm_repack_single "$pkg" "$packversion" "$packrelease" || fatal 'Error with $pkg repacking.'
         [ -n "$repacked_pkgs" ] && repacked_pkgs="$repacked_pkgs $repacked_pkg" || repacked_pkgs="$repacked_pkg"
     done
 }
@@ -10863,7 +10883,6 @@ epm_repack()
 
     [ -n "$pkg_names" ] && warning 'Can'\''t find $pkg_names files'
     [ -z "$pkg_files" ] && info "Empty repack list was skipped" && return 22
-
     if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then
         if [ -n "$install" ] ; then
             epm install $repacked_pkgs
@@ -11007,6 +11026,8 @@ __assure_exists_rpmbuild()
 __epm_repack_to_rpm()
 {
     local pkg="$1"
+    local packversion="$2"
+    local packrelease="$3"
 
     # Note: install epm-repack for static (package based) dependencies
     assure_exists cpio
@@ -11046,12 +11067,12 @@ __epm_repack_to_rpm()
 
         alpkg=$(basename $pkg)
         # don't use abs package path: copy package to temp dir and use there
-        cp -l $verbose $pkg $tmpbuilddir/../$alpkg 2>/dev/null || cp $verbose $pkg $tmpbuilddir/../$alpkg || fatal
+        cp -l $verbose $abspkg $tmpbuilddir/../$alpkg 2>/dev/null || cp -s $verbose $abspkg $tmpbuilddir/../$alpkg 2>/dev/null || cp $verbose $abspkg $tmpbuilddir/../$alpkg || fatal
         [ -r "$pkg.eepm.yaml" ] && cp $verbose $pkg.eepm.yaml $tmpbuilddir/../$alpkg.eepm.yaml
 
         cd $tmpbuilddir/../ || fatal
         # fill alpkg and SUBGENERIC
-        __prepare_source_package "$(realpath $alpkg)"
+        __prepare_source_package "$(pwd)/$alpkg"
         # override abspkg
         abspkg="$(realpath $alpkg)"
         cd $tmpbuilddir/ || fatal
@@ -11103,6 +11124,13 @@ __epm_repack_to_rpm()
         # reassign package name (could be renamed in fix scripts)
         pkgname="$(grep "^Name: " $spec | sed -e "s|Name: ||g" | head -n1)"
 
+        if [ -n "$packversion" ]; then
+            sed -i "s|^Version: .*|Version: $packversion|" "$spec"
+        fi
+        if [ -n "$packrelease" ]; then
+            sed -i "s|^Release: .*|Release: $packrelease|" "$spec"
+        fi
+
         if [ -n "$EEPM_INTERNAL_PKGNAME" ] ; then
             if ! estrlist contains "$pkgname" "$EEPM_INTERNAL_PKGNAME" ; then
                 fatal 'Some bug: the name of the repacking package ($pkgname) differs with the package name ($EEPM_INTERNAL_PKGNAME) from play.d script.'
@@ -14570,7 +14598,7 @@ epm_status_repacked()
     local pkg="$1"
 
     # dpkg package missing packager field
-    local repacked="$(epm print field Description for "$1" | grep -qi "alien" 2>/dev/null)"
+    local repacked="$(epm print field Description for "$1" 2>/dev/null | grep -qi "alien")"
     local packager="$(epm print field Packager for "$1" 2>/dev/null)"
 
     #is_installed $pkg || fatal "FIXME: implemented for installed packages as for now"
@@ -14604,7 +14632,7 @@ epm_status_thirdparty()
 
     #is_installed $pkg || fatal "FIXME: implemented for installed packages as for now"
     distribution="$(epm print field Distribution for "$pkg" 2>/dev/null )"
-    repacked="$(epm print field Description for "$1" | grep -qi "alien" 2>/dev/null)"
+    repacked="$(epm print field Description for "$1" 2>/dev/null | grep -qi "alien")"
     maintainer="$(epm print field Maintainer for "$pkg" 2>/dev/null)"
 
     case $BASEDISTRNAME in
@@ -14830,9 +14858,11 @@ __save_available_packages()
     [ -d /etc/bash_completion.d ] || return 0
 
     # HACK: too much time (5 minutes) on deb systems in a docker
-    [ $PMTYPE = "apt-dpkg" ] && return 0
+    # [ $PMTYPE = "apt-dpkg" ] && return 0
 
     info "Retrieving list of all available packages (for autocompletion) ..."
+    # can ask sudo later
+    set_sudo
     short=--short update=update epm_list_available | sort | sudorun tee $epm_vardir/available-packages >/dev/null
 }
 
@@ -19640,7 +19670,9 @@ epm_cachedir=/var/cache/eepm
 eget_ipfs_db=$epm_vardir/eget-ipfs-db.txt
 
 # load system wide config
-[ -f $CONFIGDIR/eepm.conf ] && . $CONFIGDIR/eepm.conf
+for i in $CONFIGDIR/eepm.conf $CONFIGDIR/conf.d/*.conf ; do
+    [ -f $CONFIGDIR/$i ] && . $CONFIGDIR/$i
+done
 
 
 case $PROGNAME in

packed/serv.sh

@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
 # will replaced with /etc/eepm during install
 CONFIGDIR=$PROGDIR/../etc
 
-EPMVERSION="3.64.37"
+EPMVERSION="3.64.38"
 
 # package, single (file), pipe, git
 EPMMODE="package"