Skip to content

use common xfce desktop for Desktop app #48

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 2 commits into from
Nov 16, 2025
+17 −21
Merged

use common xfce desktop for Desktop app #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5c268
use common xfce desktop for Desktop app
smoors Nov 15, 2025
9b3251a
version bump
smoors Nov 15, 2025
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
9 changes: 4 additions & 5 deletions apps/vub_desktop/form.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ attributes:
required: true
desktop: "xfce"
resolution:
widget: select
label: "screen resolution"
help: "This defines the resolution of your screen."
widget: "select"
label: "Screen resolution"
options:
- ["FullHD", "1920x1080"]
- ["HD", "1280x720"]
- ["FullHD (1920x1080)", "1920x1080"]
- ["HD (1280x720)", "1280x720"]
<%= ERB.new(File.read(File.expand_path("../common_files/_extra_attributes.yml.erb", __dir__)), eoutvar: "@common_attrs").result(binding) %>

form:
Expand Down
25 changes: 10 additions & 15 deletions apps/vub_desktop/template/script.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,18 @@

<%= ERB.new(File.read('../common_files/work_directory_change.sh.erb'), eoutvar: 'child').result(binding) %>

# Ensure that the user's configured login shell is used
export SHELL="$(getent passwd $USER | cut -d: -f7)"
# Benchmark info
echo "TIMING - Starting main script at: $(date)"

if [ ${SLURM_GPUS_ON_NODE:-0} -gt 0 ]; then
gpu_bus_id=$(nvidia-smi --query-gpu=gpu_bus_id --format=csv,noheader)
# to lowercase
gpu_bus_id=${gpu_bus_id,,}
# Need to strip off first 4 zeros
dri_device=$(ls -d /sys/bus/pci/devices/${gpu_bus_id:4}/drm/card*)
export VGL_DISPLAY=/dev/dri/${dri_device##*/}
export VGL_LOGO=1 # for testing
echo "Setting VGL_DISPLAY to $VGL_DISPLAY"
else
export VGL_DISPLAY=$DISPLAY
fi
# Set VGL_DISPLAY to a GPU card if available, otherwise to Mesa llvmpipe
<%= ERB.new(File.read('../common_files/oodegl.sh.erb'), eoutvar: 'child').result(binding) %>

<%- unless context.global_prerun.empty? -%>
<%= context.global_prerun.gsub("\r", "") %>
<%- end -%>

# Start up desktop
echo "Launching desktop '<%= context.desktop %>'..."
source "<%= session.staged_root.join("desktops", "#{context.desktop}.sh") %>"
<%= ERB.new(File.read("../common_files/desktops/#{context.desktop}.sh.erb"), eoutvar: 'child').result(binding) %>

echo "Desktop '<%= context.desktop %>' ended with $? status..."
4 changes: 3 additions & 1 deletion ondemand-vub.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Summary: Scripts, customizations and tools for Open OnDemand
Name: ondemand-vub
Version: 2.06
Version: 2.07
Release: 1
BuildArch: noarch
License: GPL
Expand Down Expand Up @@ -57,6 +57,8 @@ Scripts, customizations and tools for Open OnDemand as used at the VUB.
/var/www/ood/apps/sys

%changelog
* Sat Nov 15 2025 Samuel Moors <[email protected]>
- Use common xfce desktop for Desktop app
* Thu Nov 13 2025 Ward Poelmans <[email protected]>
- Create bookmarks for VSC directories
* Tue Nov 11 2025 Samuel Moors <[email protected]>
Expand Down