Instead of two scripts calling one another, now it's only one script, with added variable names inside for clarity. Also hopefully finally fixes the help messages for good. fixes QubesOS/qubes-issues#4058
		
			
				
	
	
		
			89 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
set -e
 | 
						|
#
 | 
						|
# The Qubes OS Project, https://www.qubes-os.org#
 | 
						|
#
 | 
						|
# Copyright (C) 2017 Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 | 
						|
#
 | 
						|
# This program is free software; you can redistribute it and/or
 | 
						|
# modify it under the terms of the GNU General Public License
 | 
						|
# as published by the Free Software Foundation; either version 2
 | 
						|
# of the License, or (at your option) any later version.
 | 
						|
#
 | 
						|
# This program is distributed in the hope that it will be useful,
 | 
						|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
# GNU General Public License for more details.
 | 
						|
#
 | 
						|
# You should have received a copy of the GNU General Public License
 | 
						|
# along with this program; if not, write to the Free Software
 | 
						|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 | 
						|
#
 | 
						|
#
 | 
						|
 | 
						|
PROGRAM_NAME=${0##*/}
 | 
						|
 | 
						|
if [ "$PROGRAM_NAME" = "qvm-move-to-vm" ] || [ "$PROGRAM_NAME" = "qvm-move" ]; then
 | 
						|
  OPERATION_TYPE="move"
 | 
						|
else
 | 
						|
  OPERATION_TYPE="copy"
 | 
						|
fi
 | 
						|
 | 
						|
if [ "$PROGRAM_NAME" = "qvm-move-to-vm" ] || [ "$PROGRAM_NAME" = "qvm-copy-to-vm" ]; then
 | 
						|
  TARGET_TYPE="vm"
 | 
						|
else
 | 
						|
  TARGET_TYPE="default"
 | 
						|
fi
 | 
						|
 | 
						|
 | 
						|
if { [ $# -lt 2 ] && [ "$TARGET_TYPE" = "vm" ];} || { [ $# -lt 1 ] && [ "$TARGET_TYPE" = "default" ];} ; then
 | 
						|
 | 
						|
	if [ $TARGET_TYPE = "vm" ]; then
 | 
						|
		echo "usage: $0 [--without-progress] destination_qube_name FILE [FILE ...]"
 | 
						|
	else
 | 
						|
		echo "usage: $0 [--without-progress] FILE [FILE ...]"
 | 
						|
	fi
 | 
						|
 | 
						|
	echo
 | 
						|
 | 
						|
	if [ $OPERATION_TYPE = "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
 | 
						|
fi
 | 
						|
 | 
						|
if [ "$1" = "--without-progress" ] ; then
 | 
						|
	export PROGRESS_TYPE=none
 | 
						|
	shift
 | 
						|
else
 | 
						|
	export PROGRESS_TYPE=console
 | 
						|
fi
 | 
						|
 | 
						|
if [ "$TARGET_TYPE" = "vm" ]; then
 | 
						|
  VM="$1"
 | 
						|
  shift
 | 
						|
else
 | 
						|
  VM="@default"
 | 
						|
fi
 | 
						|
 | 
						|
if [ $PROGRESS_TYPE = console ] ; then
 | 
						|
    FILECOPY_TOTAL_SIZE=$(du --apparent-size -c -- "$@" 2> /dev/null | tail -1 | cut -f 1)
 | 
						|
    export FILECOPY_TOTAL_SIZE
 | 
						|
fi
 | 
						|
 | 
						|
if [ "$TARGET_TYPE" = "vm" ]; then
 | 
						|
    echo "qvm-copy-to-vm/qvm-move-to-vm tools are deprecated," >&2
 | 
						|
    echo "use qvm-copy/qvm-move to avoid typing target qube name twice" >&2
 | 
						|
fi
 | 
						|
 | 
						|
/usr/lib/qubes/qrexec-client-vm "$VM" qubes.Filecopy /usr/lib/qubes/qfile-agent "$@"
 | 
						|
 | 
						|
if [ "$OPERATION_TYPE" = "move" ] ; then
 | 
						|
	rm -rf -- "$@"
 | 
						|
fi
 |