Skip to content

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

pass name/version to distro_info

parent 5e9c477a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
bin/epm-sh-functions
View file @ 8cde6d5c
...@@ -98,9 +98,11 @@ echon() ...@@ -98,9 +98,11 @@ echon()
set_target_pkg_env() set_target_pkg_env()
{ {
[ -n "$DISTRNAME" ] || fatal "Missing DISTRNAME in set_target_pkg_env." [ -n "$DISTRNAME" ] || fatal "Missing DISTRNAME in set_target_pkg_env."
PKGFORMAT=$($DISTRVENDOR -p "$DISTRNAME") local ver="$DISTRVERSION"
PKGVENDOR=$($DISTRVENDOR -s "$DISTRNAME") [ -n "$ver" ] && ver="/$ver"
RPMVENDOR=$($DISTRVENDOR -n "$DISTRNAME") PKGFORMAT=$($DISTRVENDOR -p "$DISTRNAME$ver")
PKGVENDOR=$($DISTRVENDOR -s "$DISTRNAME$ver")
RPMVENDOR=$($DISTRVENDOR -n "$DISTRNAME$ver")
} }
# Print command line and run command line # Print command line and run command line
...@@ -593,7 +595,7 @@ if [ -n "$FORCEPM" ] ; then ...@@ -593,7 +595,7 @@ if [ -n "$FORCEPM" ] ; then
return return
fi fi
PMTYPE="$($DISTRVENDOR -g $DISTRNAME)" PMTYPE="$($DISTRVENDOR -g $DISTRNAME/$DISTRVERSION)"
} }
is_active_systemd() is_active_systemd()
......
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