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

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

Browse Source 
* qubesos/pr/15:
  Fall back to gnome utilities if kdialog not present

Fixes QubesOS/qubes-issue#1429
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-01 22:56:24 +02:00
commit be2c9313a4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
qubes-rpc/qvm-copy-to-vm.kde
View File

@ -19,25 +19,28 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# #
if type kdialog 2> /dev/null; then
VM=$(kdialog -inputbox "Enter the VM name to send files to:")
if [ X$VM = X ] ; then exit 0 ; fi
VM=$(kdialog -inputbox "Enter the VM name to send files to:") SIZE=$(du --apparent-size -c -- "$@" 2> /dev/null | tail -1 | cut -f 1)
if [ X$VM = X ] ; then exit 0 ; fi REF=$(kdialog --progressbar "Copy progress")
qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
SIZE=$(du --apparent-size -c -- "$@" 2> /dev/null | tail -1 | cut -f 1) export PROGRESS_TYPE=gui
REF=$(kdialog --progressbar "Copy progress")
qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
export PROGRESS_TYPE=gui /usr/lib/qubes/qrexec-client-vm $VM qubes.Filecopy \
/usr/lib/qubes/qfile-agent "$@" |
(while read sentsize ; do
CURRSIZE=$(($sentsize/1024))
qdbus $REF org.freedesktop.DBus.Properties.Set "" value $CURRSIZE
done)
/usr/lib/qubes/qrexec-client-vm $VM qubes.Filecopy \ qdbus $REF close
/usr/lib/qubes/qfile-agent "$@" | # we do not want a dozen error messages, do we
(while read sentsize ; do # if ! [ "x"$agentstatus = xDONE ] ; then
CURRSIZE=$(($sentsize/1024)) # kdialog --sorry 'Abnormal file copy termination; see /var/log/qubes/qrexec.xid.log in dom0 for more details'
qdbus $REF org.freedesktop.DBus.Properties.Set "" value $CURRSIZE # fi
done) else
exec /usr/lib/qubes/qvm-copy-to-vm.gnome "$@"
qdbus $REF close fi
# we do not want a dozen error messages, do we
# if ! [ "x"$agentstatus = xDONE ] ; then
# kdialog --sorry 'Abnormal file copy termination; see /var/log/qubes/qrexec.xid.log in dom0 for more details'
# fi

45
qubes-rpc/qvm-move-to-vm.kde
View File

@ -19,29 +19,32 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# #
if type kdialog 2> /dev/null; then
VM=$(kdialog -inputbox "Enter the VM name to send files to:")
if [ X$VM = X ] ; then exit 0 ; fi
VM=$(kdialog -inputbox "Enter the VM name to send files to:") SIZE=$(du --apparent-size -c -- "$@" 2> /dev/null | tail -1 | cut -f 1)
if [ X$VM = X ] ; then exit 0 ; fi REF=$(kdialog --progressbar "Move progress")
qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
SIZE=$(du --apparent-size -c -- "$@" 2> /dev/null | tail -1 | cut -f 1) export PROGRESS_TYPE=gui
REF=$(kdialog --progressbar "Move progress")
qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
export PROGRESS_TYPE=gui set -o pipefail
/usr/lib/qubes/qrexec-client-vm $VM qubes.Filecopy \
/usr/lib/qubes/qfile-agent "$@" |
(while read sentsize ; do
CURRSIZE=$(($sentsize/1024))
qdbus $REF org.freedesktop.DBus.Properties.Set "" value $CURRSIZE
done)
if [ $? -eq 0 ]; then
rm -rf "$@"
fi
set -o pipefail qdbus $REF close
/usr/lib/qubes/qrexec-client-vm $VM qubes.Filecopy \ # we do not want a dozen error messages, do we
/usr/lib/qubes/qfile-agent "$@" | # if ! [ "x"$agentstatus = xDONE ] ; then
(while read sentsize ; do # kdialog --sorry 'Abnormal file copy termination; see /var/log/qubes/qrexec.xid.log in dom0 for more details'
CURRSIZE=$(($sentsize/1024)) # fi
qdbus $REF org.freedesktop.DBus.Properties.Set "" value $CURRSIZE else
done) exec /usr/lib/qubes/qvm-move-to-vm.gnome "$@"
if [ $? -eq 0 ]; then
rm -rf "$@"
fi fi
qdbus $REF close
# we do not want a dozen error messages, do we
# if ! [ "x"$agentstatus = xDONE ] ; then
# kdialog --sorry 'Abnormal file copy termination; see /var/log/qubes/qrexec.xid.log in dom0 for more details'
# fi