Skip to content

E
eepm
Commit 6943c6cf authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm: improve hack for install by provides

parent d4120578
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
bin/epm
View file @ 6943c6cf
...@@ -597,7 +597,7 @@ check_filenames() ...@@ -597,7 +597,7 @@ check_filenames()
local opt local opt
for opt in "$@" ; do for opt in "$@" ; do
# files can be with full path or have extension via . # files can be with full path or have extension via .
if [ -f "$opt" ] && echo "$opt" | grep -q "[/\.]" ; then if [ -f "$opt" ] && rhas "$opt" "[/\.]" ; then
has_space "$opt" && warning "There are space(s) in filename '$opt', it is not supported. Skipped" && continue has_space "$opt" && warning "There are space(s) in filename '$opt', it is not supported. Skipped" && continue
[ -n "$pkg_files" ] && pkg_files="$pkg_files $opt" || pkg_files="$opt" [ -n "$pkg_files" ] && pkg_files="$pkg_files $opt" || pkg_files="$opt"
elif [ -d "$opt" ] ; then elif [ -d "$opt" ] ; then
...@@ -606,12 +606,13 @@ check_filenames() ...@@ -606,12 +606,13 @@ check_filenames()
elif is_url "$opt" ; then elif is_url "$opt" ; then
has_space "$opt" && warning "There are space(s) in URL '$opt', it is not supported. Skipped" && continue has_space "$opt" && warning "There are space(s) in URL '$opt', it is not supported. Skipped" && continue
[ -n "$pkg_urls" ] && pkg_urls="$pkg_urls $opt" || pkg_urls="$opt" [ -n "$pkg_urls" ] && pkg_urls="$pkg_urls $opt" || pkg_urls="$opt"
elif echo "$opt" | grep -q "[/]" ; then # hack, TODO: reasons
elif rhas "$opt" "[/]" && ! rhas "$opt" "[()]" ; then
has_space "$opt" && warning "There are space(s) in filename '$opt', it is not supported. Skipped" && continue has_space "$opt" && warning "There are space(s) in filename '$opt', it is not supported. Skipped" && continue
[ -n "$pkg_files" ] && pkg_files="$pkg_files $opt" || pkg_files="$opt" [ -n "$pkg_files" ] && pkg_files="$pkg_files $opt" || pkg_files="$opt"
else else
has_space "$opt" && warning "There are space(s) in package name '$opt', it is not supported. Skipped." && continue has_space "$opt" && warning "There are space(s) in package name '$opt', it is not supported. Skipped." && continue
echo "$opt" | grep -q "[*]" && warning "There are forbidden symbols in package name '$opt'. Skipped." && continue rhas "$opt" "[*]" && warning "There are forbidden symbols in package name '$opt'. Skipped." && continue
[ -n "$pkg_names" ] && pkg_names="$pkg_names $opt" || pkg_names="$opt" [ -n "$pkg_names" ] && pkg_names="$pkg_names $opt" || pkg_names="$opt"
fi fi
[ -n "$quoted_args" ] && quoted_args="$quoted_args \"$opt\"" || quoted_args="\"$opt\"" [ -n "$quoted_args" ] && quoted_args="$quoted_args \"$opt\"" || quoted_args="\"$opt\""
......
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