epm-sh-install: move some status related check code to epm-status

bin/epm-sh-install

@@ -67,51 +67,6 @@ get_only_installed_packages()
     estrlist exclude "$(echo "$installlist" | (skip_installed='yes' filter_out_installed_packages))" "$installlist"
 }
 
-__convert_pkgallowscripts_to_regexp()
-{
-    local tmpalf="$(mktemp)" || fatal
-    # copied from eget's filter_glob
-    # check man glob
-    # remove commentы and translate glob to regexp
-    grep -v "^[[:space:]]*#" "$1" | grep -v "^[[:space:]]*$" | sed -e "s|\*|.*|g" -e "s|?|.|g" -e "s|^|^|" -e "s|$|\$|" >$tmpalf
-    echo "$tmpalf"
-}
-
-__epm_package_name_ok_scripts()
-{
-    local name="$1"
-    local alf="$CONFIGDIR/pkgallowscripts.list"
-    [ -s "$alf" ] || return 1
-    [ -n "$name" ] || return 1
-    local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
-    echo "$name" | grep -q -f $tmpalf
-    local res=$?
-    rm $tmpalf
-    return $res
-}
-
-__epm_package_ok_scripts()
-{
-    local pkg="$1"
-    local name
-    # TODO: improve epm print name and use it here
-    name="$(epm print field Name for "$pkg" 2>/dev/null)"
-    [ -n "$name" ] || return 1
-    __epm_package_name_ok_scripts "$name"
-}
-
-__epm_vendor_ok_scripts()
-{
-    local vendor="$1"
-    local alf="$CONFIGDIR/vendorallowscripts.list"
-    [ -s "$alf" ] || return 1
-    [ -n "$vendor" ] || return 1
-    local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
-    echo "$vendor" | grep -q -f $tmpalf
-    local res=$?
-    rm $tmpalf
-    return $res
-}
 
 __epm_print_warning_for_nonalt_packages()
 {
@@ -187,3 +142,4 @@ __epm_check_vendor()
         noscripts="--noscripts"
     done
 }
+

bin/epm-status

@@ -19,6 +19,54 @@
 
 load_helper epm-query
 
+
+__convert_pkgallowscripts_to_regexp()
+{
+    local tmpalf="$(mktemp)" || fatal
+    # copied from eget's filter_glob
+    # check man glob
+    # remove commentы and translate glob to regexp
+    grep -v "^[[:space:]]*#" "$1" | grep -v "^[[:space:]]*$" | sed -e "s|\*|.*|g" -e "s|?|.|g" -e "s|^|^|" -e "s|$|\$|" >$tmpalf
+    echo "$tmpalf"
+}
+
+__epm_package_name_ok_scripts()
+{
+    local name="$1"
+    local alf="$CONFIGDIR/pkgallowscripts.list"
+    [ -s "$alf" ] || return 1
+    [ -n "$name" ] || return 1
+    local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
+    echo "$name" | grep -q -f $tmpalf
+    local res=$?
+    rm $tmpalf
+    return $res
+}
+
+__epm_package_ok_scripts()
+{
+    local pkg="$1"
+    local name
+    # TODO: improve epm print name and use it here
+    name="$(epm print field Name for "$pkg" 2>/dev/null)"
+    [ -n "$name" ] || return 1
+    __epm_package_name_ok_scripts "$name"
+}
+
+__epm_vendor_ok_scripts()
+{
+    local vendor="$1"
+    local alf="$CONFIGDIR/vendorallowscripts.list"
+    [ -s "$alf" ] || return 1
+    [ -n "$vendor" ] || return 1
+    local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
+    echo "$vendor" | grep -q -f $tmpalf
+    local res=$?
+    rm $tmpalf
+    return $res
+}
+
+
 epm_status_installable()
 {
     local pkg="$1"