Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/126'

Browse Source 
* qubesos/pr/126:
  Avoid leaking VM name in qvm-copy usage text
  Add proper help text to qvm-copy tools and fix incorrect behavior for qvm-move
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-17 11:39:07 +02:00
commit f037ffa852
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubes-rpc/qvm-copy-to-vm
View File

@ -22,7 +22,23 @@ set -e
# #
if [ $# -lt 2 ] ; then if [ $# -lt 2 ] ; then
echo "usage: $0 [--without-progress] dest_vmname file [file]+"
if [ "${0##*/}" = "qvm-move-to-vm" ] || [ "${0##*/}" = "qvm-copy-to-vm" ]; then
echo "usage: $0 [--without-progress] destination_qube_name FILE [FILE ...]"
else
echo "usage: $0 [--without-progress] FILE [FILE ...]"
fi
echo
if [ "${0##*/}" = "qvm-move-to-vm" ] || [ "${0##*/}" = "qvm-move" ] ; then
echo "Move FILE to ~/QubesIncoming/[THIS QUBE'S NAME]/ in the destination qube."
else
echo "Copy FILE to ~/QubesIncoming/[THIS QUBE'S NAME]/ in the destination qube."
fi
echo
echo "You will be prompted to select the destination qube. If FILE is a directory, it will be copied recursively."
exit 1 exit 1
fi fi
@ -49,6 +65,6 @@ fi
/usr/lib/qubes/qrexec-client-vm "$VM" qubes.Filecopy /usr/lib/qubes/qfile-agent "$@" /usr/lib/qubes/qrexec-client-vm "$VM" qubes.Filecopy /usr/lib/qubes/qfile-agent "$@"
if [ "${0##*/}" = "qvm-move-to-vm" ]; then if [ "${0##*/}" = "qvm-move-to-vm" ] || [ "${0##*/}" = "qvm-move" ] ; then
rm -rf -- "$@" rm -rf -- "$@"
fi fi