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

Add qubes-run-gnome-terminal utility that uses --wait

Browse Source
This commit is contained in:
Pawel Marczewski 2020-01-27 12:11:48 +01:00
parent c7060bb97a
commit 943f37b481
No known key found for this signature in database
GPG Key ID: DE42EE9B14F96465
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -233,6 +233,7 @@ install-common: install-doc
install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request
install -m 0755 misc/qubes-run-terminal $(DESTDIR)/$(BINDIR) install -m 0755 misc/qubes-run-terminal $(DESTDIR)/$(BINDIR)
install -D -m 0644 misc/qubes-run-terminal.desktop $(DESTDIR)/$(APPLICATIONSDIR)/qubes-run-terminal.desktop install -D -m 0644 misc/qubes-run-terminal.desktop $(DESTDIR)/$(APPLICATIONSDIR)/qubes-run-terminal.desktop
install -m 0755 misc/qubes-run-gnome-terminal $(DESTDIR)/$(BINDIR)
install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi
@ -245,7 +246,7 @@ install-common: install-doc
install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm
cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm
install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper
install -m 0755 misc/qvm-console $(DESTDIR)$(BINDIR)/qvm-console install -m 0755 misc/qvm-console $(DESTDIR)$(BINDIR)/qvm-console

1
debian/qubes-core-agent.install vendored
View File

@ -97,6 +97,7 @@ usr/bin/qubes-desktop-run
usr/bin/qubes-open usr/bin/qubes-open
usr/bin/qubes-session-autostart usr/bin/qubes-session-autostart
usr/bin/qubes-run-terminal usr/bin/qubes-run-terminal
usr/bin/qubes-run-gnome-terminal
usr/bin/qubes-vmexec usr/bin/qubes-vmexec
usr/bin/qvm-copy usr/bin/qvm-copy
usr/bin/qvm-copy-to-vm usr/bin/qvm-copy-to-vm

12
misc/qubes-run-gnome-terminal Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
# Wrapper around gnome-terminal that runs it with --wait option
# (if supoported).
# Check if our gnome-terminal version supports --wait
# (we can't just run it and check exit code, because if it works, it will
# return the exit code of the child process)
if gnome-terminal --help-terminal-options | grep --silent -- --wait; then
exec gnome-terminal --wait "$@"
else
exec gnome-terminal "$@"
fi

9
misc/qubes-run-terminal
View File

@ -12,14 +12,7 @@ if is_command x-terminal-emulator; then
fi fi
if is_command gnome-terminal; then if is_command gnome-terminal; then
# Check if our gnome-terminal version supports --wait exec qubes-run-gnome-terminal
# (we can't just run it and check exit code, because if it works, it will
# return the exit code of the child process)
if gnome-terminal --help-terminal-options | grep --silent -- --wait; then
exec gnome-terminal --wait
else
exec gnome-terminal
fi
fi fi
for terminal in xfce4-terminal konsole urxvt rxvt termit terminator Eterm aterm roxterm termite lxterminal mate-terminal terminology st xterm; do for terminal in xfce4-terminal konsole urxvt rxvt termit terminator Eterm aterm roxterm termite lxterminal mate-terminal terminology st xterm; do

1
rpm_spec/core-agent.spec.in
View File

@ -615,6 +615,7 @@ rm -f %{name}-%{version}
/usr/bin/xenstore-watch-qubes /usr/bin/xenstore-watch-qubes
/usr/bin/qubes-desktop-run /usr/bin/qubes-desktop-run
/usr/bin/qubes-run-terminal /usr/bin/qubes-run-terminal
/usr/bin/qubes-run-gnome-terminal
/usr/bin/qubes-open /usr/bin/qubes-open
/usr/bin/qubes-session-autostart /usr/bin/qubes-session-autostart
/usr/bin/qvm-console /usr/bin/qvm-console