Skip to content
This repository has been archived by the owner on Dec 29, 2023. It is now read-only.

Commit

Permalink
fix: attempt to fix snap packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
srevinsaju committed Oct 3, 2020
1 parent 37d4028 commit f5609e2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/pythonapp.yml
Expand Up @@ -15,9 +15,7 @@ on:

jobs:
quality:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
Expand All @@ -28,6 +26,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Lint with flake8
run: |
pip install flake8
Expand All @@ -44,7 +43,7 @@ jobs:
run: |
echo "adapted from https://github.com/AppImage/appimage.github.io/blob/master/.travis.yml"
sudo apt-get update
sudo apt-get -qq -y install imagemagick libasound2-dev pulseaudio-utils alsa-utils alsa-oss libjack0 desktop-file-utils xmlstarlet xterm xvfb icewm x11-utils x11-apps netpbm xdotool libgl1-mesa-dri libgl1-mesa-dev mesa-utils libosmesa6 libsdl1.2-dev fonts-wqy-microhei libfile-mimeinfo-perl libx11-xcb1 libxcb-xkb1 libxcb-* libxcb-render-util0 libxkbcommon-x11-0 libxkbcommon0 scrcpy> /dev/null # appstream # TODO: Cache me!
sudo apt-get -qq -y install imagemagick libasound2-dev pulseaudio-utils alsa-utils alsa-oss libjack0 desktop-file-utils xmlstarlet xterm xvfb icewm x11-utils x11-apps netpbm xdotool libgl1-mesa-dri libgl1-mesa-dev mesa-utils libosmesa6 libsdl1.2-dev fonts-wqy-microhei libfile-mimeinfo-perl libx11-xcb1 libxcb-xkb1 libxcb-* libxcb-render-util0 libxkbcommon-x11-0 libxkbcommon0 scrcpy> /dev/null # appstream # TODO: Cache me!
mkdir $HOME/.icewm/
echo "ShowTaskBar = 0" > $HOME/.icewm/preferences
echo "TaskBarAutoHide = 1" > $HOME/.icewm/preferences
Expand All @@ -60,12 +59,9 @@ jobs:
run: |
chmod +x scripts/display-ci.sh
/usr/bin/xvfb-run --auto-servernum ./scripts/display-ci.sh guiscrcpy
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
with:
name: guiscrcpy-screenshot.png
path: screenshot.png


8 changes: 8 additions & 0 deletions guiscrcpy/cli.py
Expand Up @@ -21,6 +21,14 @@
colorama.init()


# srevin: bad snap!
_sys_argv = list()
for arg in sys.argv:
if not arg.startswith('/snap'):
_sys_argv.append(arg)
sys.argv = _sys_argv


def show_version(ctx, param, value): # noqa:
"""Prints the version of the utility"""
if not value or ctx.resilient_parsing:
Expand Down
2 changes: 1 addition & 1 deletion releaser
Expand Up @@ -133,7 +133,7 @@ except FileNotFoundError:
requirements = ['PyQt5>=5.14,<5.16', 'pynput', 'qtpy', 'click', 'colorama']
if platform.system() == 'Windows':
requirements.extend(['pywin32', 'psutil'])
requirements.extend(['pywin32', 'psutil', 'win32com'])
elif platform.system() == 'Linux':
requirements.extend(['psutil', 'cairosvg'])
Expand Down

0 comments on commit f5609e2

Please sign in to comment.