From f8b5b3f6197ef1913ecf59dbc2ec2a18da411ea0 Mon Sep 17 00:00:00 2001
From: raojinlin <raojinlin302@gmail.com>
Date: Thu, 29 Feb 2024 16:42:52 +0800
Subject: [PATCH] fix running in manjaro

---
 .github/workflows/release-linux.yaml | 43 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release-linux.yaml b/.github/workflows/release-linux.yaml
index 70e2dd4..35d24b6 100644
--- a/.github/workflows/release-linux.yaml
+++ b/.github/workflows/release-linux.yaml
@@ -121,38 +121,39 @@ jobs:
 
       - name: Package up appimage file
         run: |
-           curl https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-${{ steps.normalise_platform_arch.outputs.arch }}.AppImage \
+          curl https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-${{ steps.normalise_platform_arch.outputs.arch }}.AppImage \
                 -o linuxdeploy \
                 -L
-           chmod u+x linuxdeploy
+          chmod u+x linuxdeploy
 
-           ./linuxdeploy --appdir AppDir
+          ./linuxdeploy --appdir AppDir
 
-           pushd AppDir
-           # Copy WebKit files.
-           find /usr/lib* -name WebKitNetworkProcess -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
-           find /usr/lib* -name WebKitWebProcess -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
-           find /usr/lib* -name libwebkit2gtkinjectedbundle.so -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
-           popd
+          pushd AppDir
+          # Copy WebKit files.
+          find /usr/lib* -name WebKitNetworkProcess -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
+          find /usr/lib* -name WebKitWebProcess -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
+          find /usr/lib* -name libwebkit2gtkinjectedbundle.so -exec mkdir -p $(dirname '{}') \; -exec cp --parents '{}' "." \; || true
+          popd
 
 
-           mkdir -p AppDir/usr/share/icons/hicolor/512x512/apps
-           build_dir="build/linux/tiny-rdm_${{ steps.normalise_version.outputs.version }}_amd64"
+          mkdir -p AppDir/usr/share/icons/hicolor/512x512/apps
+          build_dir="build/linux/tiny-rdm_${{ steps.normalise_version.outputs.version }}_amd64"
 
-           cp -r $build_dir/usr/share/icons/hicolor/512x512/apps/tiny-rdm.png AppDir/usr/share/icons/hicolor/512x512/apps/
-           cp $build_dir/usr/local/bin/tiny-rdm AppDir/usr/bin/
+          cp -r $build_dir/usr/share/icons/hicolor/512x512/apps/tiny-rdm.png AppDir/usr/share/icons/hicolor/512x512/apps/
+          cp $build_dir/usr/local/bin/tiny-rdm AppDir/usr/bin/
 
 
-           sed -i 's#/usr/local/bin/tiny-rdm#tiny-rdm#g' $build_dir/usr/share/applications/tiny-rdm.desktop
+          sed -i 's#/usr/local/bin/tiny-rdm#tiny-rdm#g' $build_dir/usr/share/applications/tiny-rdm.desktop
 
-           curl -o linuxdeploy-plugin-gtk.sh "https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
-           chmod +x linuxdeploy-plugin-gtk.sh
+          curl -o linuxdeploy-plugin-gtk.sh "https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
+          sed '/XDG_DATA_DIRS/a export WEBKIT_DISABLE_COMPOSITING_MODE=1'
+          chmod +x linuxdeploy-plugin-gtk.sh
 
-           ./linuxdeploy --appdir AppDir \
-              --output=appimage \
-              --plugin=gtk \
-              -e $build_dir/usr/local/bin/tiny-rdm \
-              -d $build_dir/usr/share/applications/tiny-rdm.desktop
+          ./linuxdeploy --appdir AppDir \
+             --output=appimage \
+             --plugin=gtk \
+             -e $build_dir/usr/local/bin/tiny-rdm \
+             -d $build_dir/usr/share/applications/tiny-rdm.desktop
 
       - name: Rename deb
         working-directory: ./build/linux