Skip to content

Commit

Permalink
adapt to changes suggested by mvidner
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Dec 4, 2013
1 parent 056f921 commit c44ef2d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions scripts/yast2
Expand Up @@ -218,14 +218,16 @@ while true ; do
esac
done

# deprecated, drop after SLE12
if [ "$Y2_INSTALL_PACKAGES" = "true" ]; then
if [ $# -eq 0 ]; then
echo "DEPRECATED. Use sw_single directly: $0 sw_single" >&2
export module="sw_single"
else
# support passing text files with packages, ycp list of files are dropped
if [[ -f $1 && ! $1 == .*\.rpm ]] ; then
cmd='zypper --non-interactive '$Y2_INSTALL_ACTION' `cat '$1'`'
# support passing text files with packages
# any ycp file support is dropped
if [[ -f "$1" && ! "$1" == *rpm ]] ; then
cmd="zypper --non-interactive $Y2_INSTALL_ACTION \`cat \"$1\"\`"
else
cmd="zypper --non-interactive $Y2_INSTALL_ACTION $@"
fi
Expand Down

0 comments on commit c44ef2d

Please sign in to comment.