[gnome-tweak-tool] Explicitly call python2 on shebangs



commit 7a0d422324d00a8a3a1730e4c57c1a9757713908
Author: Rui Matos <tiagomatos gmail com>
Date:   Tue May 30 14:42:53 2017 +0200

    Explicitly call python2 on shebangs
    
    We'll migrate to python3 soon but for now let's be explicit with the
    python version we require since both 2 and 3 are now commonly
    installed everywhere.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771910

 .gitignore                                         |    1 -
 Makefile.am                                        |    9 ++-------
 gnome-tweak-tool                                   |    2 +-
 ...-inhibitor.in => gnome-tweak-tool-lid-inhibitor |    2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3cdfb2..b1585d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ compile
 m4/
 data/gnome-tweak-tool.appdata.xml
 data/gnome-tweak-tool.desktop
-gnome-tweak-tool-lid-inhibitor
diff --git a/Makefile.am b/Makefile.am
index a9954ff..4d7d320 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@ bin_SCRIPTS = \
 libexec_SCRIPTS = \
        gnome-tweak-tool-lid-inhibitor
 
-gnome-tweak-tool-lid-inhibitor: gnome-tweak-tool-lid-inhibitor.in Makefile
-       $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! < $< > $@
-       chmod +x $@
-
 #nobase means gtweak dir is preserved in site-packages
 appdir = $(pythondir)
 nobase_dist_app_PYTHON = \
@@ -18,15 +14,14 @@ nobase_app_PYTHON = gtweak/defs.py
 
 EXTRA_DIST = \
        $(bin_SCRIPTS) \
-       gnome-tweak-tool-lid-inhibitor.in
+       $(libexec_SCRIPTS)
 
 CLEANFILES = \
        $(wildcard $(srcdir)/gtweak/*.pyc) \
        $(wildcard $(srcdir)/gtweak/tweaks/*.pyc)
 
 DISTCLEANFILES = \
-       gtweak/defs.py \
-       gnome-tweak-tool-lid-inhibitor
+       gtweak/defs.py
 
 SUBDIRS = data po
 
diff --git a/gnome-tweak-tool b/gnome-tweak-tool
index 8f05d52..017fab0 100755
--- a/gnome-tweak-tool
+++ b/gnome-tweak-tool
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gnome-tweak-tool-lid-inhibitor.in b/gnome-tweak-tool-lid-inhibitor
old mode 100644
new mode 100755
similarity index 98%
rename from gnome-tweak-tool-lid-inhibitor.in
rename to gnome-tweak-tool-lid-inhibitor
index 7a48f6b..3ca94e3
--- a/gnome-tweak-tool-lid-inhibitor.in
+++ b/gnome-tweak-tool-lid-inhibitor
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!/usr/bin/python2
 
 import gi
 gi.require_version("GLib", "2.0")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]