Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow appimages to run in conty #39

Merged
merged 5 commits into from
Oct 13, 2024
Merged

Allow appimages to run in conty #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dae19dd
Use patched bwrap
Samueru-sama Oct 13, 2024
abed0f4
Enable `CAP_SYS_ADMIN` in AppRun
Samueru-sama Oct 13, 2024
e9815d6
Also add patched bwrap to container
Samueru-sama Oct 13, 2024
50de638
Reuse existing patched bwrap in container
Samueru-sama Oct 13, 2024
7f2a1e4
Pre-extract the utils
Samueru-sama Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ jobs:
APP=steam
wget -q https://raw.githubusercontent.com/ivan-hc/Conty/master/create-conty.sh
wget -q https://raw.githubusercontent.com/ivan-hc/Conty/master/conty-start.sh
wget -q https://github.com/ivan-hc/Conty/releases/download/utils/utils_dwarfs.tar.gz
wget -q https://github.com/Samueru-sama/Conty/releases/download/utils/utils_dwarfs.tar.gz
chmod +x create-arch-bootstrap.sh create-conty.sh "$APP"-conty-builder.sh
tar fx ./utils_dwarfs.tar.gz
sudo ./create-arch-bootstrap.sh && ./create-conty.sh
mkdir -p tmp/"$APP".AppDir
mv ./conty.sh tmp/"$APP".AppDir/ || exit 1
Expand Down
5 changes: 5 additions & 0 deletions create-arch-bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ unmount_chroot
# Clear pacman package cache
rm -f "${bootstrap}"/var/cache/pacman/pkg/*

# Use the patched bwrap to allow launching AppImages from conty
echo "Using patched bubblewrap..."
cp ./utils/bwrap "${bootstrap}"/usr/bin || exit 1
chmod +x "${bootstrap}"/usr/bin/bwrap || exit 1

# Create some empty files and directories
# This is needed for bubblewrap to be able to bind real files/dirs to them
# later in the conty-start.sh script
Expand Down
2 changes: 1 addition & 1 deletion steam-conty-builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ cat >> ./AppRun << 'EOF'
#!/bin/sh
HERE="$(dirname "$(readlink -f "${0}")")"
export UNION_PRELOAD="${HERE}"
"${HERE}"/conty.sh --bind-try /usr/share/fonts /usr/share/fonts -- steam-screensaver-fix-runtime "$@"
"${HERE}"/conty.sh --cap-add CAP_SYS_ADMIN --bind-try /usr/share/fonts /usr/share/fonts -- steam-screensaver-fix-runtime "$@"
EOF
chmod a+x ./AppRun

Expand Down