More Linux integration (#1085)

* Add integration shell scripts for linux!

These shell scripts (one for appimage and one for dynamic) both should:
1: Move the program files to ~/.local/Attorney_Online
2: Create a .desktop file (which is what applications on Linux use to know to be interacted with) in the ~/.local/share/applications folder (where all other user applications tend to go), with at current a temporary logo until the logo file is parsed out from the xapplication window.
3: open the application, assuming the necessary dependencies are fulfilled
Dynamic required some further support due to the startup shell command working correctly when you click it manually, but struggling on the .desktop folder, so it has the additional step of recreating the current launch.sh command, which still functions if you go to the folder to click it, or if you open the program before integration to test things.

Both sh commands open AO2-Client at completion time. I hope this will help newer Linux users, or older Linux users who normally wouldn't bother, to bring AO into their normal day to day experience.

This has been tested on (by me):
Fedora 40 Workstation (Gnome)
Arch Linux KDE Plasma 6
Ubuntu Unity 24.10 aka Oracular Oriole
Debian 13 Trixie (Before it's freeze, marking date February 9th 2025)

Thank you for reading, have a wonderful day!

* linux CI tweaks

* remove the need for `launch.sh`
* add git hash as appimage version
* bit of reorganization

* add linux install scripts to CI

* tweak linux install scripts to add install scripts
* remove `launch.sh` (as per previous commit)
* add instructions in README_LINUX

* include icon in linux install

* fix install script

and fix typo

* add exec path to desktop files

* why would freedesktop.org do this to me

---------

Co-authored-by: OrioleNix <163466443+OrioleNix@users.noreply.github.com>
This commit is contained in:
lambdcalculus 2025-03-17 06:32:11 -03:00 committed by GitHub
parent c0c278e63c
commit ef1a8ddb92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 78 additions and 16 deletions

View File

@ -187,13 +187,16 @@ jobs:
cd ${{ github.workspace }}/bin cd ${{ github.workspace }}/bin
mkdir ./imageformats mkdir ./imageformats
cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats
cp ../scripts/launch.sh . cp ../data/logo-client.png ./icon.png
cp ../README_LINUX.md . cp ../README_LINUX.md .
chmod +x launch.sh cp ../scripts/DYNAMIC_INSTALL.sh ./INSTALL.sh
chmod +x INSTALL.sh
chmod +x Attorney_Online chmod +x Attorney_Online
patchelf --add-rpath . Attorney_Online
cd .. cd ..
tar --transform='flags=r;s|bin|Attorney_Online|' -cvf Attorney_Online-Dynamic.tar bin tar --transform='flags=r;s|bin|Attorney Online|' -cvf Attorney_Online-Dynamic.tar bin
- name: Create AppImage - name: Create AppImage
shell: bash shell: bash
@ -214,17 +217,23 @@ jobs:
cp scripts/Attorney_Online.desktop AppDir/usr/share/applications cp scripts/Attorney_Online.desktop AppDir/usr/share/applications
cp data/logo-client.png AppDir/Attorney_Online.png cp data/logo-client.png AppDir/Attorney_Online.png
GIT_SHORT_SHA="${GITHUB_SHA::8}"
QTDIR=${QT_ROOT_DIR} ./appimagetool deploy AppDir/usr/share/applications/Attorney_Online.desktop QTDIR=${QT_ROOT_DIR} ./appimagetool deploy AppDir/usr/share/applications/Attorney_Online.desktop
ARCH=x86_64 VERSION=2.11 ./appimagetool AppDir ARCH=x86_64 VERSION=${GIT_SHORT_SHA} ./appimagetool AppDir
- name: Deploy AppImage
shell: bash
run: |
mkdir bin-appimage mkdir bin-appimage
cp -r bin/base bin-appimage cp -r bin/base bin-appimage
cp data/logo-client.png bin-appimage/icon.png
cp README_LINUX.md bin-appimage cp README_LINUX.md bin-appimage
cp scripts/APPIMAGE_INSTALL.sh bin-appimage/INSTALL.sh
cp Attorney_Online-*-x86_64.AppImage bin-appimage cp Attorney_Online-*-x86_64.AppImage bin-appimage
chmod +x bin-appimage/INSTALL.sh
chmod +x bin-appimage/Attorney_Online-*-x86_64.AppImage chmod +x bin-appimage/Attorney_Online-*-x86_64.AppImage
tar -cvf Attorney_Online-AppImage.tar bin-appimage/* tar --transform='flags=r;s|bin-appimage|Attorney Online|' -cvf Attorney_Online-AppImage.tar bin-appimage
tar --transform='flags=r;s|bin-appimage|Attorney_Online|' -cvf Attorney_Online-AppImage.tar bin-appimage
- name: Upload Dynamic Artifact - name: Upload Dynamic Artifact
uses: actions/upload-artifact@master uses: actions/upload-artifact@master

View File

@ -2,6 +2,8 @@
There are two download options for running on Linux: the **dynamically-linked** build and the **AppImage**. The dynamic build is lighter, but might only run on newer systems. The AppImage is a bit bigger, but should run seamlessly on most systems (anything newer than Ubuntu 22.04 LTS). There are two download options for running on Linux: the **dynamically-linked** build and the **AppImage**. The dynamic build is lighter, but might only run on newer systems. The AppImage is a bit bigger, but should run seamlessly on most systems (anything newer than Ubuntu 22.04 LTS).
Each version also accompanies an `INSTALL.sh` script that will create a desktop file for AO pointing to where the script was ran. This will enable you to run AO from an app launcher. Note that moving AO's folder will require running this script again.
### AppImage ### AppImage
If you downloaded the **AppImage** version, it should just be plug-and-play. If you run into errors or bugs, contact us in our [Discord server](https://discord.gg/wWvQ3pw) or open an [issue on GitHub](https://github.com/AttorneyOnline/AO2-Client/issues). If you downloaded the **AppImage** version, it should just be plug-and-play. If you run into errors or bugs, contact us in our [Discord server](https://discord.gg/wWvQ3pw) or open an [issue on GitHub](https://github.com/AttorneyOnline/AO2-Client/issues).

View File

@ -0,0 +1,32 @@
#!/bin/bash
# exit on error
set -e
# Move to script's directory
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
cd "${SCRIPT_DIR}"
#add .desktop file (which should allow most DE's easy access to the program
mkdir -p ~/.local/share/applications
# desktop files don't like spaces in the Exec field, we have to replace them with "\s"
appimage="$(echo Attorney_Online-*-x86_64.AppImage)"
escaped_exec="$(echo "$(pwd)" | sed 's/ /\\s/g')"/"$appimage"
desktop_file="\
[Desktop Entry]
Type=Application
Name=Attorney Online
Comment=The courtroom drama simulator
Path=$(pwd)
Exec=\"$escaped_exec\"
Icon=$(pwd)/icon.png"
echo "$desktop_file" > ~/.local/share/applications/'Attorney Online'.desktop
#marking the program as executable
chmod +x Attorney_Online-*-x86_64.AppImage
#running the executable
./Attorney_Online-*-x86_64.AppImage

View File

@ -0,0 +1,29 @@
#!/bin/bash
# exit on error
set -e
# Move to script's directory
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
cd "${SCRIPT_DIR}"
#add .desktop file (which should allow most DE's easy access to the program
mkdir -p ~/.local/share/applications
# desktop files don't like spaces in the Exec field, we have to replace them with "\s"
escaped_exec="$(echo "$(pwd)" | sed 's/ /\\s/g')"/Attorney_Online
desktop_file="\
[Desktop Entry]
Type=Application
Name=Attorney Online
Comment=The courtroom drama simulator
Path=$(pwd)
Exec=\"$escaped_exec\"
Icon=$(pwd)/icon.png"
echo "$desktop_file" > ~/.local/share/applications/'Attorney Online'.desktop
#running the program
chmod +x Attorney_Online
./Attorney_Online

View File

@ -1,10 +0,0 @@
#!/bin/bash
# Required to launch correctly
# Move to AO's directory
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
cd "${SCRIPT_DIR}"
# Run with correct linker path
chmod +x Attorney_Online
LD_LIBRARY_PATH=. ./Attorney_Online