Commit 8e2c96a2 authored by Vitaly Lipatov's avatar Vitaly Lipatov

add env EPM_OPTIONS support

parent dfc3fe84
...@@ -440,6 +440,11 @@ check_filenames() ...@@ -440,6 +440,11 @@ check_filenames()
done done
} }
# handle external EPM_OPTIONS
for opt in $EPM_OPTIONS ; do
check_option "$opt"
done
FLAGENDOPTS= FLAGENDOPTS=
for opt in "$@" ; do for opt in "$@" ; do
[ "$opt" = "--" ] && FLAGENDOPTS=1 && continue [ "$opt" = "--" ] && FLAGENDOPTS=1 && continue
...@@ -451,6 +456,9 @@ for opt in "$@" ; do ...@@ -451,6 +456,9 @@ for opt in "$@" ; do
check_filenames "$opt" check_filenames "$opt"
done done
# fill
export EPM_OPTIONS="$nodeps $force $non_interactive"
# if input is not console and run script from file, get pkgs from stdin too # if input is not console and run script from file, get pkgs from stdin too
if [ ! -n "$inscript" ] && ! inputisatty && [ -n "$PROGDIR" ] ; then if [ ! -n "$inscript" ] && ! inputisatty && [ -n "$PROGDIR" ] ; then
for opt in $(withtimeout 10 cat) ; do for opt in $(withtimeout 10 cat) ; do
......
...@@ -80,7 +80,7 @@ __epm_check_if_try_install_rpm() ...@@ -80,7 +80,7 @@ __epm_check_if_try_install_rpm()
__epm_repack_rpm_to_deb $split_replaced_pkgs __epm_repack_rpm_to_deb $split_replaced_pkgs
# TODO: move to install # TODO: move to install
docmd epm install $force $nodeps $repacked_debs docmd epm install $repacked_debs
return 0 return 0
} }
...@@ -250,7 +250,7 @@ __epm_check_if_try_install_deb() ...@@ -250,7 +250,7 @@ __epm_check_if_try_install_deb()
__epm_repack_to_rpm $split_replaced_pkgs || fatal __epm_repack_to_rpm $split_replaced_pkgs || fatal
# TODO: move to install # TODO: move to install
docmd epm install $force $nodeps $repacked_rpms docmd epm install $repacked_rpms
# TODO: move it to exit handler # TODO: move it to exit handler
if [ -z "$DEBUG" ] ; then if [ -z "$DEBUG" ] ; then
......
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