Skip to content

Commit c78b3da

Browse files
authored
Minor AppImage fixes (#561)
1 parent 4491560 commit c78b3da

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
- name: "Install system dependencies"
101101
run: |
102102
sudo apt update -qq
103-
sudo apt install -y clang-12 cmake freeglut3-dev libgcrypt20-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build
103+
sudo apt install -y clang-12 cmake freeglut3-dev libgcrypt20-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build appstream
104104
105105
- name: "Build AppImage"
106106
run: dist/linux/appimage.sh

dist/linux/appimage.sh

+24-22
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22

3-
if [ -z "${GITHUB_WORKSPACE}" ]; then
4-
export GITHUB_WORKSPACE="."
3+
if [[ -z "${GITHUB_WORKSPACE}" ]]; then
4+
export GITHUB_WORKSPACE="."
55
fi
6-
6+
77
curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
88
chmod a+x linuxdeploy*.AppImage
9-
curl -sSfL https://github.com$(curl https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) -o mkappimage.AppImage
9+
curl -sSfL https://github.com"$(curl https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)" -o mkappimage.AppImage
1010
chmod a+x mkappimage.AppImage
1111
curl -sSfLO "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
1212
chmod a+x linuxdeploy-plugin-gtk.sh
@@ -16,36 +16,38 @@ if [[ ! -e /usr/lib/x86_64-linux-gnu ]]; then
1616
fi
1717

1818
mkdir -p AppDir/usr/bin
19-
cp dist/linux/{info.cemu.Cemu.desktop,info.cemu.Cemu.png} AppDir/
20-
21-
mkdir -p AppDir/usr/share/applications
22-
mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps
19+
mkdir -p AppDir/usr/share/Cemu
20+
mkdir -p AppDir/usr/share/applications
21+
mkdir -p AppDir/usr/share/icons/hicolor/128x128/apps
22+
mkdir -p AppDir/usr/share/metainfo
2323
mkdir -p AppDir/usr/lib
2424

25-
cp -r bin AppDir/usr/share/Cemu
26-
cp /usr/lib/x86_64-linux-gnu/{libsepol.so.1,libffi.so.7,libpcre.so.3,libGLU.so.1,libthai.so.0} AppDir/usr/lib
25+
cp dist/linux/info.cemu.Cemu.{desktop,png} AppDir/
26+
cp dist/linux/info.cemu.Cemu.metainfo.xml AppDir/usr/share/metainfo/info.cemu.Cemu.appdata.xml
27+
28+
cp -r bin/* AppDir/usr/share/Cemu
2729

2830
mv AppDir/usr/share/Cemu/Cemu AppDir/usr/bin/
2931
chmod +x AppDir/usr/bin/Cemu
3032

33+
cp /usr/lib/x86_64-linux-gnu/{libsepol.so.1,libffi.so.7,libpcre.so.3,libGLU.so.1,libthai.so.0} AppDir/usr/lib
34+
3135
export UPD_INFO="gh-releases-zsync|cemu-project|Cemu|ci|Cemu.AppImage.zsync"
32-
./linuxdeploy-x86_64.AppImage --appimage-extract-and-run\
33-
--appdir="$GITHUB_WORKSPACE"/AppDir/ \
34-
-d "$GITHUB_WORKSPACE"/AppDir/info.cemu.Cemu.desktop \
35-
-i "$GITHUB_WORKSPACE"/AppDir/info.cemu.Cemu.png \
36-
-e "$GITHUB_WORKSPACE"/AppDir/usr/bin/Cemu \
36+
./linuxdeploy-x86_64.AppImage --appimage-extract-and-run \
37+
--appdir="${GITHUB_WORKSPACE}"/AppDir/ \
38+
-d "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.desktop \
39+
-i "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.png \
40+
-e "${GITHUB_WORKSPACE}"/AppDir/usr/bin/Cemu \
3741
--plugin gtk
3842

39-
GITVERSION=$(git rev-parse --short HEAD)
40-
echo $GITVERSION
41-
if [[ -z ${GITVERSION} ]]; then
43+
if ! GITVERSION="$(git rev-parse --short HEAD 2>/dev/null)"; then
4244
GITVERSION=experimental
4345
fi
44-
4546
echo "Cemu Version Cemu-${GITVERSION}"
47+
4648
rm AppDir/usr/lib/libwayland-client.so.0
4749
echo "export LC_ALL=C" >> AppDir/apprun-hooks/linuxdeploy-plugin-gtk.sh
48-
VERSION=${GITVERSION} ./mkappimage.AppImage --appimage-extract-and-run "$GITHUB_WORKSPACE"/AppDir
50+
VERSION="${GITVERSION}" ./mkappimage.AppImage --appimage-extract-and-run "${GITHUB_WORKSPACE}"/AppDir
4951

50-
mkdir -p "$GITHUB_WORKSPACE"/artifacts/
51-
mv Cemu-${GITVERSION}-x86_64.AppImage "$GITHUB_WORKSPACE"/artifacts/
52+
mkdir -p "${GITHUB_WORKSPACE}"/artifacts/
53+
mv Cemu-"${GITVERSION}"-x86_64.AppImage "${GITHUB_WORKSPACE}"/artifacts/

0 commit comments

Comments
 (0)