From 3b0f80e19fae0f9e093ddfc4bbeb3cf28239c0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 24 Oct 2018 00:24:50 +0200
Subject: [PATCH] Make shebang explicit /usr/bin/python2 where it's still there

Both Archlinux and Fedora 29 have guidelines to point explicitly at
/usr/bin/python2 where it expect python2.

Also, do not use env.

Fixes QubesOS/qubes-issues#4027
---
 misc/qubes-desktop-run       | 2 +-
 misc/qubes-session-autostart | 2 +-
 misc/qvm-features-request    | 2 +-
 misc/yum-qubes-hooks.py      | 2 +-
 qubes-rpc/qrun-in-vm         | 2 +-
 qubes-rpc/xdg-icon           | 2 +-
 qubesagent/xdg.py            | 2 --
 7 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/misc/qubes-desktop-run b/misc/qubes-desktop-run
index 89df349..61de3ee 100755
--- a/misc/qubes-desktop-run
+++ b/misc/qubes-desktop-run
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from qubesagent.xdg import launch
 import sys
diff --git a/misc/qubes-session-autostart b/misc/qubes-session-autostart
index 04a8de3..7c117a8 100644
--- a/misc/qubes-session-autostart
+++ b/misc/qubes-session-autostart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # -*- coding: utf-8 -*-
 #
 # The Qubes OS Project, http://www.qubes-os.org
diff --git a/misc/qvm-features-request b/misc/qvm-features-request
index 9fcc61b..52964d0 100755
--- a/misc/qvm-features-request
+++ b/misc/qvm-features-request
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
 # vim: fileencoding=utf-8
 
 #
diff --git a/misc/yum-qubes-hooks.py b/misc/yum-qubes-hooks.py
index 3224a42..794311b 100644
--- a/misc/yum-qubes-hooks.py
+++ b/misc/yum-qubes-hooks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #
diff --git a/qubes-rpc/qrun-in-vm b/qubes-rpc/qrun-in-vm
index 2f04ed2..266f621 100755
--- a/qubes-rpc/qrun-in-vm
+++ b/qubes-rpc/qrun-in-vm
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Send the command to the remote side, and then transfer stdin from local to
 # remote and stdout from remote to local.
 #
diff --git a/qubes-rpc/xdg-icon b/qubes-rpc/xdg-icon
index 5a981fa..a6a81b5 100755
--- a/qubes-rpc/xdg-icon
+++ b/qubes-rpc/xdg-icon
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 import xdg.IconTheme
 import sys
 import os
diff --git a/qubesagent/xdg.py b/qubesagent/xdg.py
index 744950d..8b57411 100755
--- a/qubesagent/xdg.py
+++ b/qubesagent/xdg.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from gi.repository import Gio  # pylint: disable=import-error
 from gi.repository import GLib  # pylint: disable=import-error
 import sys