extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-25 00:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-6115_egress_notifications_all_distros' into 'develop'

Browse Source 
KASM-6115 Egress notification support for all distros

Closes KASM-6115

See merge request kasm-technologies/internal/workspaces-core-images!211
This commit is contained in:
Justin Travis 2024-07-12 09:56:58 +00:00
commit e11736723b
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci-scripts/template-vars.yaml
View File

@ -23,6 +23,7 @@ files: &UNIVERSAL_CHANGE_FILES
- src/ubuntu/install/tools/** - src/ubuntu/install/tools/**
- src/ubuntu/install/webcam/** - src/ubuntu/install/webcam/**
- src/ubuntu/install/recorder/** - src/ubuntu/install/recorder/**
- src/ubuntu/install/xfce
- ci-scripts/** - ci-scripts/**
- .gitlab-ci.yml - .gitlab-ci.yml

38
src/ubuntu/install/xfce/install_xfce_ui.sh
View File

@ -133,6 +133,14 @@ elif [[ "$DISTRO" == @(rockylinux9|almalinux9) ]]; then
xclip \ xclip \
xfce4-notifyd \ xfce4-notifyd \
xset xset
# fix for xfce4-notifyd not being rachable
dbus-uuidgen --ensure
cat > /usr/share/dbus-1/services/org.freedesktop.Notifications.service <<EOL
[D-BUS Service]
Name=org.freedesktop.Notifications
Exec=/usr/lib64/xfce4/notifyd/xfce4-notifyd
EOL
elif [[ "$DISTRO" == @(rockylinux8|almalinux8) ]]; then elif [[ "$DISTRO" == @(rockylinux8|almalinux8) ]]; then
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
@ -144,13 +152,22 @@ elif [[ "$DISTRO" == @(rockylinux8|almalinux8) ]]; then
xclip \ xclip \
xfce4-notifyd \ xfce4-notifyd \
xset xset
# fix for xfce4-notifyd not being rachable
dbus-uuidgen --ensure
cat > /usr/share/dbus-1/services/org.freedesktop.Notifications.service <<EOL
[D-BUS Service]
Name=org.freedesktop.Notifications
Exec=/usr/lib64/xfce4/notifyd/xfce4-notifyd
EOL
elif [ "$DISTRO" = "opensuse" ]; then elif [ "$DISTRO" = "opensuse" ]; then
zypper install -yn -t pattern xfce zypper install -yn -t pattern xfce
zypper install -yn \ zypper install -yn \
gvfs \ gvfs \
xclip \ xclip \
xfce4-notifyd \
xfce4-terminal \ xfce4-terminal \
xfce4-notifyd \
kdialog \
xset xset
# Pidof is no longer shipped in OpenSuse # Pidof is no longer shipped in OpenSuse
ln -s /usr/bin/pgrep /usr/bin/pidof ln -s /usr/bin/pgrep /usr/bin/pidof
@ -162,6 +179,14 @@ elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39|fedora40) ]]; then
xclip \ xclip \
xfce4-notifyd \ xfce4-notifyd \
xset xset
# fix for xfce4-notifyd not being rachable
dbus-uuidgen --ensure
cat > /usr/share/dbus-1/services/org.freedesktop.Notifications.service <<EOL
[D-BUS Service]
Name=org.freedesktop.Notifications
Exec=/usr/lib64/xfce4/notifyd/xfce4-notifyd
EOL
elif [ "$DISTRO" = "alpine" ]; then elif [ "$DISTRO" = "alpine" ]; then
apk add --no-cache \ apk add --no-cache \
dbus-x11 \ dbus-x11 \
@ -175,8 +200,17 @@ elif [ "$DISTRO" = "alpine" ]; then
mousepad \ mousepad \
thunar \ thunar \
xfce4 \ xfce4 \
xfce4-terminal xfce4-terminal \
xfce4-notifyd
rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop
# fix for xfce4-notifyd not being rachable
dbus-uuidgen --ensure
cat > /usr/share/dbus-1/services/org.freedesktop.Notifications.service <<EOL
[D-BUS Service]
Name=org.freedesktop.Notifications
Exec=/usr/lib/xfce4/notifyd/xfce4-notifyd
EOL
fi fi
if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|fedora40|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|fedora40|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then