Skip to content

Commit 54876d9

Browse files
authored
Try #2208:
2 parents 345d81c + f381b02 commit 54876d9

File tree

5 files changed

+48
-9
lines changed

5 files changed

+48
-9
lines changed

snap-wrappers/bin/launch-multipass-gui

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,14 @@
33
. client-common.sh
44
link_autostart
55

6+
if [ ! -e "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc" ]; then
7+
mkdir -p "${XDG_CONFIG_HOME}/xfce4/terminal/"
8+
cat <<EOT > "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc"
9+
[Configuration]
10+
Encoding=UTF-8
11+
MiscMenubarDefault=FALSE
12+
ShortcutsNoMenukey=TRUE
13+
EOT
14+
fi
15+
616
exec "$SNAP/bin/multipass.gui" "$@"

snap/hooks/install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash -e
2+
3+
# GDK pixbuf setup
4+
export LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:${SNAP}/graphics/lib:${SNAP}/lib:${SNAP}/usr/lib:${SNAP}/lib/${ARCH_TRIPLET}:${SNAP}/usr/lib/${ARCH_TRIPLET}
5+
$SNAP/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE"

snap/hooks/post-refresh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash -e
22

33
rm -f $SNAP_COMMON/snap_refresh
4+
5+
# GDK pixbuf setup
6+
export LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:${SNAP}/graphics/lib:${SNAP}/lib:${SNAP}/usr/lib:${SNAP}/lib/${ARCH_TRIPLET}:${SNAP}/usr/lib/${ARCH_TRIPLET}
7+
$SNAP/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE"

snap/snapcraft.yaml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@ base: core20
1616
layout:
1717
/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qemu:
1818
bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qemu
19+
/usr/share/X11:
20+
bind: $SNAP/usr/share/X11
21+
/etc/fonts:
22+
bind: $SNAP/etc/fonts
23+
/usr/share/fonts:
24+
bind: $SNAP/usr/share/fonts
25+
/usr/share/icons:
26+
bind: $SNAP/usr/share/icons
27+
28+
environment:
29+
# GDK pixbuf
30+
GDK_PIXBUF_MODULEDIR: $SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders
31+
GDK_PIXBUF_MODULE_FILE: $SNAP_COMMON/loaders.cache
32+
ARCH_TRIPLET: ${SNAPCRAFT_ARCH_TRIPLET}
1933

2034
plugs:
2135
all-home:
@@ -154,17 +168,22 @@ parts:
154168
stage-packages:
155169
- try: [msr-tools]
156170

157-
xterm:
171+
terminal:
158172
plugin: nil
159-
override-pull: ""
160173
stage-packages:
161-
- xterm
174+
- xfce4-terminal
175+
- dmz-cursor-theme
176+
- libgdk-pixbuf2.0-bin # GDK pixbuf
177+
- fonts-freefont-ttf
178+
override-build: |
179+
snapcraftctl build
180+
update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
181+
rm -f $SNAPCRAFT_PART_INSTALL/usr/share/applications/exo-*
182+
mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/
183+
echo "[Icon Theme]" > $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/index.theme
184+
echo "Inherits=DMZ-White" >> $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/index.theme
162185
stage:
163-
- -usr/lib/*/libfreetype.so.6
164-
- -usr/share/doc/libfreetype6/FTL.TXT.gz
165-
- -usr/share/doc/libfreetype6/TODO
166-
- -usr/share/doc/libfreetype6/changelog.Debian.gz
167-
- -usr/share/doc/libfreetype6/pcf/README
186+
- -usr/share/doc
168187

169188
glue:
170189
plugin: dump

src/platform/client/client_platform_linux.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ void mcp::open_multipass_shell(const QString& instance_name)
2626
{
2727
assert(!instance_name.isEmpty() && "Instance name cannot be empty");
2828
QProcess::startDetached(
29-
"xterm", {"-title", instance_name, "-j", "-e", QString("multipass shell %1 || read").arg(instance_name)});
29+
"xfce4-terminal",
30+
{"--initial-title", instance_name, "-e", QString("bash -c 'multipass shell %1 || read'").arg(instance_name)});
3031
}
3132

3233
QStringList mcp::gui_tray_notification_strings()

0 commit comments

Comments
 (0)