From f5609e2c5fe247df418acab3232eb633143bd36e Mon Sep 17 00:00:00 2001
From: Srevin Saju <srevinsaju@sugarlabs.org>
Date: Sat, 3 Oct 2020 16:57:04 +0300
Subject: [PATCH] fix: attempt to fix snap packaging

---
 .github/workflows/pythonapp.yml | 10 +++-------
 guiscrcpy/cli.py                |  8 ++++++++
 releaser                        |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 6cc7eb6f..f5848116 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -15,9 +15,7 @@ on:
 
 jobs:
   quality:
-
     runs-on: ubuntu-20.04
-
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python 3.8
@@ -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
@@ -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
@@ -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
-
-        
diff --git a/guiscrcpy/cli.py b/guiscrcpy/cli.py
index 81d4c0bf..c8749450 100644
--- a/guiscrcpy/cli.py
+++ b/guiscrcpy/cli.py
@@ -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:
diff --git a/releaser b/releaser
index 39a01da5..1ec4bcf0 100755
--- a/releaser
+++ b/releaser
@@ -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'])