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

* qubesos/pr/5:
  Use #!/bin/bash and && in qvm-move-to-vm
  qvm-copy-to-vm: Fix running with multiple file arguments
  qvm-move-to-vm: Remove duplicated code

file-copy-vm/qvm-copy-to-vm

@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/bash
+set -e -o pipefail
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #
@@ -28,4 +29,11 @@ fi
 VM="$1"
 shift
 
-exec /usr/bin/qvm-run --pass-io --localcmd "/usr/lib/qubes/qfile-dom0-agent $@" "$VM" "QUBESRPC qubes.Filecopy dom0"
+TMPDIR=`mktemp -d`
+trap 'rm -rf -- "$TMPDIR"' EXIT
+RESPONSE=$TMPDIR/response
+mkfifo -- "$RESPONSE"
+
+# can't use $@ with --localcmd, and $* would fail on whitespace
+/usr/lib/qubes/qfile-dom0-agent "$@" <"$RESPONSE" |
+qvm-run --pass-io "$VM" "QUBESRPC qubes.Filecopy dom0" >"$RESPONSE"

file-copy-vm/qvm-move-to-vm

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #
@@ -20,14 +20,5 @@
 #
 #
 
-if [ $# -lt 2 ] ; then
+. qvm-copy-to-vm "$@" &&
-    echo usage: $0 'dest_vmname file [file]+'
-    exit 1
-fi
-
-VM="$1"
-shift
-
-set -e
-/usr/bin/qvm-run --pass-io --localcmd "/usr/lib/qubes/qfile-dom0-agent $@" "$VM" "QUBESRPC qubes.Filecopy dom0"
 rm -rf -- "$@"