From 6e4d39c7b3bb2f1c80144d4eea8ff2a375ae1f06 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@openmailbox.org>
Date: Tue, 16 Feb 2016 08:33:54 +0000
Subject: [PATCH] Use #!/bin/bash and && in qvm-move-to-vm

 #!/bin/bash because qvm-move-to-vm sources qvm-copy-to-vm, which has
a bashism (-o pipefail).

&& is safer in case qvm-*copy*-to-vm is ever changed to call 'set +e'.
---
 file-copy-vm/qvm-move-to-vm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/file-copy-vm/qvm-move-to-vm b/file-copy-vm/qvm-move-to-vm
index def8380..475530f 100644
--- a/file-copy-vm/qvm-move-to-vm
+++ b/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,6 +20,5 @@
 #
 #
 
-set -e
-. qvm-copy-to-vm "$@"
+. qvm-copy-to-vm "$@" &&
 rm -rf -- "$@"