Skip to content

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

epm-restore: fix epm restore command example

parent f7e6e618
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
bin/epm-restore
View file @ b885f999
...@@ -83,7 +83,7 @@ __epm_lineprint_python_array() ...@@ -83,7 +83,7 @@ __epm_lineprint_python_array()
local a="$*" local a="$*"
[ -n "$a" ] || return [ -n "$a" ] || return
local name="$(__epm_get_array_name "$a")" local name="$(__epm_get_array_name "$a")"
(echo "$a" | sed -E -e 's@(\]|\)).*@\1@' ; echo "print('\n'.join($name))" ) | ( a= python - || a= python3 ) (echo "$a" | sed -E -e 's@(\]|\)).*@\1@' ; echo "print('\n'.join($name))" ) | ( a= python3 - || a= python - )
} }
# translate pip requirement lines to rpm notation # translate pip requirement lines to rpm notation
...@@ -132,7 +132,7 @@ __epm_restore_pip() ...@@ -132,7 +132,7 @@ __epm_restore_pip()
reqmacro="%py3_use" reqmacro="%py3_use"
basename "$req_file" | egrep -q "(dev|test)" && reqmacro="%py3_buildrequires" basename "$req_file" | egrep -q "(dev|test)" && reqmacro="%py3_buildrequires"
echo echo
echo "# generated by epm --restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file" echo "# generated by epm restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file"
cat $req_file | __epm_restore_convert_to_rpm_notation | sed -e "s|^|$reqmacro |" cat $req_file | __epm_restore_convert_to_rpm_notation | sed -e "s|^|$reqmacro |"
return return
else else
...@@ -193,7 +193,7 @@ $l" ...@@ -193,7 +193,7 @@ $l"
if [ -n "$dryrun" ] ; then if [ -n "$dryrun" ] ; then
echo echo
echo "# generated by epm --restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file $(__epm_get_array_name "$section")" echo "# generated by epm restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file $(__epm_get_array_name "$section")"
__epm_lineprint_python_array "$ar" | __epm_restore_convert_to_rpm_notation ">=" | sed -e "s|^|$reqmacro |" __epm_lineprint_python_array "$ar" | __epm_restore_convert_to_rpm_notation ">=" | sed -e "s|^|$reqmacro |"
else else
ilist="$ilist $(__epm_lineprint_python_array "$ar" | __epm_restore_convert_to_rpm_notation ">=" | cut -d' ' -f 1 | sed -e "s|^|python3-module-|")" ilist="$ilist $(__epm_lineprint_python_array "$ar" | __epm_restore_convert_to_rpm_notation ">=" | cut -d' ' -f 1 | sed -e "s|^|python3-module-|")"
...@@ -259,11 +259,11 @@ __epm_restore_npm() ...@@ -259,11 +259,11 @@ __epm_restore_npm()
local lt=$(mktemp) local lt=$(mktemp)
a= jq .dependencies <$req_file >$lt a= jq .dependencies <$req_file >$lt
echo echo
echo "# generated by epm --restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file" echo "# generated by epm restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file"
__epm_print_npm_list "Requires:" $lt __epm_print_npm_list "Requires:" $lt
echo echo
echo "# devDependencies generated by epm --restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file" echo "# devDependencies generated by epm restore --dry-run from $(basename $(dirname $(realpath $req_file)))/$req_file"
a= jq .devDependencies <$req_file >$lt a= jq .devDependencies <$req_file >$lt
__epm_print_npm_list "BuildRequires:" $lt __epm_print_npm_list "BuildRequires:" $lt
rm -f $lt rm -f $lt
......
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