ff77c78ecc
- Symlink the other three tools to qvm-copy-to-vm.gnome, use the same
code where possible, and select differing behavior based on invoked
name (like the CLI tools). This brings qvm-move-to-vm.kde up to date
for R4.0 (bugfix on 89183e9).
- Get rid of a window focus race between zenity/kdialog and the
qubes.Filecopy dom0 permission dialog: Only launch the GUI after the
first line has been read from qfile-agent.
- Avoid visual glitches (e.g. for a non-existing file) by special-casing
a no-op progress function for $SIZE == 0.
- Pass -- separator between 'rm -rf' and the files to be removed, in
case someone or something ever invokes the tool on relative file names
starting with a dash.
- Pass -b (implies --apparent-size) and -s to du, to simplify percentage
calculation and to avoid unnecessary output.
63 lines
2.1 KiB
Bash
Executable File
63 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# The Qubes OS Project, http://www.qubes-os.org
|
|
#
|
|
# Copyright (C) 2010 Rafal Wojtczuk <rafal@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.
|
|
#
|
|
#
|
|
|
|
SIZE=$(du -bcs -- "$@" 2>/dev/null | tail -n 1 | cut -f 1)
|
|
set -e -o pipefail
|
|
|
|
if [[ $SIZE == 0 ]]; then
|
|
progress() {
|
|
cat >/dev/null
|
|
}
|
|
elif [[ $0 == *.kde ]] && command -v kdialog >/dev/null; then
|
|
progress() {
|
|
(while read -r CURRSIZE; do
|
|
if [[ $CURRSIZE == 0 ]]; then
|
|
# shellcheck disable=SC2207
|
|
REF=( $(kdialog --progressbar "$DESCRIPTION") )
|
|
trap 'qdbus "${REF[@]}" close' EXIT # for this subshell
|
|
qdbus "${REF[@]}" Set "" maximum "$SIZE"
|
|
fi
|
|
|
|
qdbus "${REF[@]}" Set "" value "$CURRSIZE"
|
|
done) >/dev/null # hide qdbus's empty output lines
|
|
}
|
|
else
|
|
progress() {
|
|
while read -r CURRSIZE; do
|
|
echo $((100 * CURRSIZE / SIZE))
|
|
done | {
|
|
read -r # wait for first line (always "0") and throw it away
|
|
zenity --progress --text="$DESCRIPTION" --auto-close
|
|
}
|
|
}
|
|
fi
|
|
|
|
if [[ ${0##*/} == qvm-move-to-vm.* ]]; then
|
|
DESCRIPTION="Moving files..."
|
|
trap '[[ $? == 0 ]] && rm -rf -- "$@"' EXIT
|
|
else
|
|
DESCRIPTION="Copying files..."
|
|
fi
|
|
|
|
PROGRESS_TYPE=gui /usr/lib/qubes/qrexec-client-vm \$default qubes.Filecopy \
|
|
/usr/lib/qubes/qfile-agent "$@" | progress
|