Skip to content
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.

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

Fixes for Xfce. #423

Merged
merged 1 commit into from Nov 1, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Fixes for Xfce.

  • Loading branch information
Algernon-01 committed Oct 31, 2018
commit bb87de2006d5ea6389480d4443b58ea82c11bef2
@@ -11,9 +11,11 @@ parse_cmd_target_error() {
parse_cmd_flavor_error() {
echo "${red}${bold}You must add either:
--flavor whonix-gateway-kde
--flavor whonix-gateway-xfce
--flavor whonix-gateway-rpi
--flavor whonix-gateway-cli
--flavor whonix-workstation-kde
--flavor whonix-workstation-xfce
--flavor whonix-workstation-cli
--flavor whonix-custom-workstation
--flavor debian-vm-kde
@@ -44,11 +46,13 @@ Build Whonix.
--clean
Deletes build products (.raw, .ova and VirtualBox VM's).
--flavor whonix-gateway-kde|whonix-gateway-rpi|whonix-gateway-cli|whonix-workstation-kde|whonix-workstation-cli|whonix-custom-workstation|debian-vm-cli|debian-vm-kde|hardened-debian-cli|hardened-debian-kde
--flavor whonix-gateway-kde|whonix-gateway-xfce|whonix-gateway-rpi|whonix-gateway-cli|whonix-workstation-kde|whonix-workstation-xfce|whonix-workstation-cli|whonix-custom-workstation|debian-vm-cli|debian-vm-kde|hardened-debian-cli|hardened-debian-kde
whonix-gateway-kde: Builds Whonix-Gateway KDE.
whonix-gateway-xfce: Builds Whonix-Gateway XFCE.
whonix-gateway-rpi: Builds Whonix-Gateway CLI for the RPi 3.
whonix-gateway-cli: Builds a Whonix-Gateway CLI.
whonix-workstation-kde: Builds Whonix-Workstation KDE.
whonix-workstation-xfce: Builds Whonix-Workstation XFCE.
whonix-workstation-cli: Builds Whonix-Workstation CLI.
whonix-custom-workstation: Builds Whonix-Custom-Workstation.
debian-vm-cli: Builds Debian VM CLI
@@ -197,12 +201,16 @@ whonix_build_one_parse_cmd() {
export WHONIX_BUILD_FLAVOR
if [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-kde" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-xfce" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-rpi" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-cli" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-kde" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-xfce" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-cli" ]; then
build_machines_counter="$(( $build_machines_counter + 1 ))"
elif [ "$WHONIX_BUILD_FLAVOR" = "whonix-custom-workstation" ]; then
@@ -127,6 +127,15 @@ if [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-kde" ]; then
[ -n "$WHONIX_BUILD_TYPE" ] || WHONIX_BUILD_TYPE="gateway"
fi

if [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-xfce" ]; then
[ -n "$SHORT_VMNAME" ] || SHORT_VMNAME="Whonix-Gateway"
[ -n "$VMNAME" ] || VMNAME="Whonix-Gateway-XFCE"
[ -n "$VMRAM" ] || VMRAM="768"
[ -n "$VRAM" ] || VRAM="16"
[ -n "$install_package" ] || install_package="non-qubes-whonix-gateway-xfce"
[ -n "$WHONIX_BUILD_TYPE" ] || WHONIX_BUILD_TYPE="gateway"
fi

if [ "$WHONIX_BUILD_FLAVOR" = "whonix-gateway-rpi" ]; then
[ -n "$SHORT_VMNAME" ] || SHORT_VMNAME="Whonix-Gateway"
[ -n "$VMNAME" ] || VMNAME="Whonix-Gateway-RPi"
@@ -154,6 +163,15 @@ if [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-kde" ]; then
[ -n "$WHONIX_BUILD_TYPE" ] || WHONIX_BUILD_TYPE="workstation"
fi

if [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-xfce" ]; then
[ -n "$SHORT_VMNAME" ] || SHORT_VMNAME="Whonix-Workstation"
[ -n "$VMNAME" ] || VMNAME="Whonix-Workstation-XFCE"
[ -n "$VMRAM" ] || VMRAM="1024"
[ -n "$VRAM" ] || VRAM="128"
[ -n "$install_package" ] || install_package="non-qubes-whonix-workstation-xfce"
[ -n "$WHONIX_BUILD_TYPE" ] || WHONIX_BUILD_TYPE="workstation"
fi

if [ "$WHONIX_BUILD_FLAVOR" = "whonix-workstation-cli" ]; then
[ -n "$SHORT_VMNAME" ] || SHORT_VMNAME="Whonix-Workstation"
[ -n "$VMNAME" ] || VMNAME="Whonix-Workstation-CLI"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.