Skip to content

Fixes for Xfce. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2018
Merged

Fixes for Xfce. #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions usr/lib/anon-shared-helper-scripts/terminal-wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
set -x
set -e

if command -v konsole_ >/dev/null 2>&1; then
if command -v konsole >/dev/null 2>&1; then
terminal_emulator_app="konsole"
elif command -v xterm_ >/dev/null 2>&1; then
elif command -v xterm >/dev/null 2>&1; then
terminal_emulator_app="xterm -e"
elif command -v xfce4-terminal >/dev/null 2>&1; then
terminal_emulator_app="xfce4-terminal"
else
error_message="$0: No supported terminal_emulator_app installed! Please install either konsole or xterm. parent:

Expand All @@ -25,11 +27,7 @@ if command -v qubesdb-read >/dev/null 2>&1; then
if [ "$terminal_emulator_app" = "konsole" ]; then
terminal_emulator_extra_args="--hold -e"
fi
else
## Non-Qubes.
if [ "$terminal_emulator_app" = "konsole" ]; then
terminal_emulator_extra_args="--hold -e --fullscreen"
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove --fullscreen for Non-Qubes-Whonix konsole?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will re-add in meanwhile.

fi

$terminal_emulator_app $terminal_emulator_extra_args "$@ ; bash"

$terminal_emulator_app $terminal_emulator_extra_args "bash"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure we need the $@. Otherwise no command can be passed and run. Will re-add.