improve messages

AlexanderShad · Sep 16, 2024 · 4bbd1a0 · 4bbd1a0
1 parent 55607ae
commit 4bbd1a0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/bin/epm-Install b/bin/epm-Install
@@ -26,7 +26,7 @@ epm_Install()
     local names="$(echo $pkg_names | filter_out_installed_packages)"
     local files="$(echo $pkg_files | filter_out_installed_packages)"
 
-    [ -z "$files$names" ] && info "Install: Skip empty install list." && return 22
+    [ -z "$files$names" ] && info "Install: Empty install list was skipped." && return 22
 
     epm_update || { [ -n "$force" ] || return ; }
 

diff --git a/bin/epm-download b/bin/epm-download
@@ -72,7 +72,10 @@ __check_if_wildcard_downloading()
     is_wildcard "$mask" || return 1
 
     local fn
-    fn="$(docmd eget --list "$url" | xargs -n1 basename)"
+    fn="$(docmd eget --list "$url" | xargs -n1 basename 2>/dev/null)"
+    # just return if there is no answer
+    [ -n "$fn" ] || return 0
+
     local wf="$(epm print shortname from filename $fn | wc -l)"
     local ws="$(epm print shortname from filename $fn | sort -u | wc -l)"
     # not the same package of various versions

diff --git a/bin/epm-install b/bin/epm-install
@@ -477,7 +477,7 @@ epm_install()
         __handle_pkg_urls_to_install
     fi
 
-    [ -z "$pkg_files$pkg_names" ] && info "Skip empty install list" && return 22
+    [ -z "$pkg_files$pkg_names" ] && info "Empty install list was skipped" && return 22
 
     # to be filter happy
     warmup_lowbase
@@ -490,7 +490,7 @@ epm_install()
     # can be empty only after all installed packages were skipped
     if [ -z "$files$names" ] ; then
         # TODO: assert $skip_installed
-        [ -n "$verbose" ] && info "Skip empty install list (filtered out, all requested packages is already installed)"
+        [ -n "$verbose" ] && info "Empty install list was skipped (filtered out, all requested packages is already installed)"
         # FIXME: see to_remove below
         return 0
     fi
@@ -511,7 +511,7 @@ epm_install()
             ;;
     esac
 
-    [ -z "$files" ] && debug "Skip empty install files list" && return 0
+    [ -z "$files" ] && debug "Empty install files list was skipped" && return 0
 
     if [ -n "$download_only" ] ; then
         # save files to the current dir before install and repack

diff --git a/bin/epm-repack b/bin/epm-repack
@@ -225,7 +225,7 @@ epm_repack()
     fi
 
     [ -n "$pkg_names" ] && warning 'Can'\''t find $pkg_names files'
-    [ -z "$pkg_files" ] && info "Skip empty repack list" && return 22
+    [ -z "$pkg_files" ] && info "Empty repack list was skipped" && return 22
 
     if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then
         if [ -n "$install" ] ; then

diff --git a/bin/epm-simulate b/bin/epm-simulate
@@ -148,7 +148,7 @@ EOF
 
 epm_simulate()
 {
-    [ -z "$pkg_filenames" ] && info "Simulate: Skip empty list" && return 22
+    [ -z "$pkg_filenames" ] && info "Simulate: skipped due empty list" && return 22
 
     local filenames="$(echo $pkg_filenames | filter_out_installed_packages)"
 

diff --git a/po/eepm.po b/po/eepm.po
@@ -1164,20 +1164,20 @@ msgid "Have no suitable appropriate install command for $PMTYPE"
 msgstr "Нет подходящей команды для установки для $PMTYPE"
 
 #: ../bin/epm-install:477
-msgid "Skip empty install list"
-msgstr "Пропустить пустой список для установки"
+msgid "Empty install list was skipped"
+msgstr "Пропускаем пустой список для установки"
 
 #: ../bin/epm-install:490
 msgid ""
-"Skip empty install list (filtered out, all requested packages is already "
+"Empty install list was skipped (filtered out, all requested packages is already "
 "installed)"
 msgstr ""
-"Пропустить пустой список для установки (отфильтровано, все запрошенные "
+"Пропускаем пустой список для установки (отфильтровано, все запрошенные "
 "пакеты уже установлены)"
 
 #: ../bin/epm-install:511
-msgid "Skip empty install files list"
-msgstr "Пропустить пустой список файлов для установки"
+msgid "Empty install files list was skipped"
+msgstr "Пропускаем пустой список файлов для установки"
 
 #: ../bin/epm-reinstall:37
 msgid "Please send me the correct command form for it"
@@ -1681,8 +1681,8 @@ msgid "Can't find $pkg_names files"
 msgstr "Не удается найти файлы $pkg_names"
 
 #: ../bin/epm-repack:228
-msgid "Skip empty repack list"
-msgstr "Пропустить пустой список переупаковок"
+msgid "Empty repack list was skipped"
+msgstr "Пропущен пустой список переупаковки"
 
 #: ../bin/epm-repack:239
 msgid "Adapted packages:"
@@ -2245,8 +2245,8 @@ msgstr ""
 "пакетов."
 
 #: ../bin/epm-Install:29
-msgid "Install: Skip empty install list."
-msgstr "Установка: пропустить пустой список установки."
+msgid "Install: Empty install list was skipped"
+msgstr "Установка: пропущен пустой список установки."
 
 #: ../bin/epm-query_package:30
 msgid ""