From b885f9990570b99c078b4230ab91e464b0dd645f Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Wed, 18 Nov 2020 15:31:37 +0300
Subject: [PATCH] epm-restore: fix epm restore command example
---
bin/epm-restore | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/epm-restore b/bin/epm-restore
index 5e80ad4..1d3ea88 100644
--- a/bin/epm-restore
+++ b/bin/epm-restore
@@ -83,7 +83,7 @@ __epm_lineprint_python_array()
local a="$*"
[ -n "$a" ] || return
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
@@ -132,7 +132,7 @@ __epm_restore_pip()
reqmacro="%py3_use"
basename "$req_file" | egrep -q "(dev|test)" && reqmacro="%py3_buildrequires"
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 |"
return
else
@@ -193,7 +193,7 @@ $l"
if [ -n "$dryrun" ] ; then
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 |"
else
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()
local lt=$(mktemp)
a= jq .dependencies <$req_file >$lt
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
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
__epm_print_npm_list "BuildRequires:" $lt
rm -f $lt
--
2.24.1