From 5d376eef6609552b06785ab20ca16832ea541218 Mon Sep 17 00:00:00 2001
From: Hector Martin <marcan@marcan.st>
Date: Wed, 30 Nov 2016 18:57:03 +0900
Subject: [PATCH] s/python/python2/g

---
 channel/banner/Makefile            | 10 +++++-----
 channel/banner/Makefile.section    |  2 +-
 pywii/Common/pywii/__init__.py     |  2 +-
 pywii/Common/pywii/ec.py           |  2 +-
 pywii/Common/pywii/wii.py          |  2 +-
 pywii/pywii-tools/addhash.py       |  2 +-
 pywii/pywii-tools/arclist.py       |  2 +-
 pywii/pywii-tools/arcpack.py       |  2 +-
 pywii/pywii-tools/certinfo.py      |  2 +-
 pywii/pywii-tools/discinfo.py      |  2 +-
 pywii/pywii-tools/dpkisign.py      |  2 +-
 pywii/pywii-tools/ecchecksig.py    |  2 +-
 pywii/pywii-tools/ecgenpriv.py     |  2 +-
 pywii/pywii-tools/ecpriv2pub.py    |  2 +-
 pywii/pywii-tools/ecsign.py        |  2 +-
 pywii/pywii-tools/extract.py       |  2 +-
 pywii/pywii-tools/extractdol.py    |  2 +-
 pywii/pywii-tools/extractfiles.py  |  2 +-
 pywii/pywii-tools/getappldr.py     |  2 +-
 pywii/pywii-tools/inject.py        |  2 +-
 pywii/pywii-tools/injectdol.py     |  2 +-
 pywii/pywii-tools/partsetios.py    |  2 +-
 pywii/pywii-tools/rsapatch.py      |  2 +-
 pywii/pywii-tools/saveinfo.py      |  2 +-
 pywii/pywii-tools/tikfix.py        |  2 +-
 pywii/pywii-tools/tikinfo.py       |  2 +-
 pywii/pywii-tools/tmdfix.py        |  2 +-
 pywii/pywii-tools/tmdinfo.py       |  2 +-
 pywii/pywii-tools/tmdupdatecr.py   |  2 +-
 pywii/pywii-tools/tmdvers.py       |  2 +-
 pywii/pywii-tools/wadinfo.py       |  2 +-
 pywii/pywii-tools/wadpack-boot2.py |  2 +-
 pywii/pywii-tools/wadpack.py       |  2 +-
 pywii/pywii-tools/wadunpack.py     |  2 +-
 34 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/channel/banner/Makefile b/channel/banner/Makefile
index cbe4bc5..d6b8dab 100644
--- a/channel/banner/Makefile
+++ b/channel/banner/Makefile
@@ -14,14 +14,14 @@ export ALAMEDA := $(CURDIR)/../../pywii/Alameda
 export PNG2TPL := $(CURDIR)/tools/png2tpl$(EXE)
 export MKBNS := $(CURDIR)/tools/mkbns$(EXE)
 export LZ77 := $(CURDIR)/tools/lz77$(EXE)
-export ADDIMD5 := python $(CURDIR)/tools/addimd5.py
-export ARCPACK := python $(PYWII)/arcpack.py
+export ADDIMD5 := python2 $(CURDIR)/tools/addimd5.py
+export ARCPACK := python2 $(PYWII)/arcpack.py
 export SOX := sox
 
 all: channel.imet
 
 channel.imet: build/data.arc names.txt tools/join-imet.py
-	python tools/join-imet.py $@ build/data.arc build/icon.arc build/banner.arc build/sound.bns names.txt
+	python2 tools/join-imet.py $@ build/data.arc build/icon.arc build/banner.arc build/sound.bns names.txt
 
 build/data.arc : build/data/meta/icon.bin build/data/meta/banner.bin build/data/meta/sound.bin
 	$(ARCPACK) $@ build/data
@@ -45,9 +45,9 @@ build/%.raw : sound/%.wav
 	$(SOX) $< -r 32000 -c 2 -e signed-integer -b 16 -t raw $@
 
 testi : channel.imet
-	python $(ALAMEDA)/Alameda.py channel.imet icon
+	python2 $(ALAMEDA)/Alameda.py channel.imet icon
 testb : channel.imet
-	python $(ALAMEDA)/Alameda.py channel.imet banner
+	python2 $(ALAMEDA)/Alameda.py channel.imet banner
 
 $(PNG2TPL): tools/*.c
 	$(MAKE) -C tools png2tpl$(EXE)
diff --git a/channel/banner/Makefile.section b/channel/banner/Makefile.section
index 5c586c1..6c97d73 100644
--- a/channel/banner/Makefile.section
+++ b/channel/banner/Makefile.section
@@ -19,7 +19,7 @@ endif
 ../build/$(TYPE)/arc/blyt/$(TYPE).brlyt $(ANIMS) : mk$(TYPE).py
 	@[ ! -d ../build/$(TYPE)/arc/anim ] && mkdir -p ../build/$(TYPE)/arc/anim || true
 	@[ ! -d ../build/$(TYPE)/arc/blyt ] && mkdir -p ../build/$(TYPE)/arc/blyt || true
-	python mk$(TYPE).py ../build/$(TYPE)/arc/blyt/$(TYPE).brlyt $(ANIMS)
+	python2 mk$(TYPE).py ../build/$(TYPE)/arc/blyt/$(TYPE).brlyt $(ANIMS)
 
 ../build/$(TYPE).arc : $(TPLS) ../build/$(TYPE)/arc/blyt/$(TYPE).brlyt $(ANIMS)
 	$(ARCPACK) ../build/$(TYPE).arc ../build/$(TYPE)
diff --git a/pywii/Common/pywii/__init__.py b/pywii/Common/pywii/__init__.py
index da598aa..86e42cb 100644
--- a/pywii/Common/pywii/__init__.py
+++ b/pywii/Common/pywii/__init__.py
@@ -1,3 +1,3 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 from wii import *
diff --git a/pywii/Common/pywii/ec.py b/pywii/Common/pywii/ec.py
index 7235312..a0468b8 100644
--- a/pywii/Common/pywii/ec.py
+++ b/pywii/Common/pywii/ec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 # Copyright 2008  Hector Martin  <marcan@marcansoft.com>
 # Licensed under the terms of the GNU GPL, version 2
diff --git a/pywii/Common/pywii/wii.py b/pywii/Common/pywii/wii.py
index 42b83c2..1338dff 100644
--- a/pywii/Common/pywii/wii.py
+++ b/pywii/Common/pywii/wii.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright 2008  Hector Martin  <marcan@marcansoft.com>
 # Licensed under the terms of the GNU GPL, version 2
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
diff --git a/pywii/pywii-tools/addhash.py b/pywii/pywii-tools/addhash.py
index 1c41b44..52de600 100755
--- a/pywii/pywii-tools/addhash.py
+++ b/pywii/pywii-tools/addhash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import sys
 import re
 import pywii as wii
diff --git a/pywii/pywii-tools/arclist.py b/pywii/pywii-tools/arclist.py
index e9330d3..61cd29c 100755
--- a/pywii/pywii-tools/arclist.py
+++ b/pywii/pywii-tools/arclist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path, struct
 import pywii as wii
diff --git a/pywii/pywii-tools/arcpack.py b/pywii/pywii-tools/arcpack.py
index a28803e..d2c49e8 100755
--- a/pywii/pywii-tools/arcpack.py
+++ b/pywii/pywii-tools/arcpack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path, struct
 import pywii as wii
diff --git a/pywii/pywii-tools/certinfo.py b/pywii/pywii-tools/certinfo.py
index 3d93844..526c0f7 100755
--- a/pywii/pywii-tools/certinfo.py
+++ b/pywii/pywii-tools/certinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/discinfo.py b/pywii/pywii-tools/discinfo.py
index ae447e3..c54921d 100755
--- a/pywii/pywii-tools/discinfo.py
+++ b/pywii/pywii-tools/discinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/dpkisign.py b/pywii/pywii-tools/dpkisign.py
index 2c0a2b8..d8de458 100755
--- a/pywii/pywii-tools/dpkisign.py
+++ b/pywii/pywii-tools/dpkisign.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii
diff --git a/pywii/pywii-tools/ecchecksig.py b/pywii/pywii-tools/ecchecksig.py
index 4fe78f2..21ba519 100755
--- a/pywii/pywii-tools/ecchecksig.py
+++ b/pywii/pywii-tools/ecchecksig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 import pywii as wii
diff --git a/pywii/pywii-tools/ecgenpriv.py b/pywii/pywii-tools/ecgenpriv.py
index b4d9dbf..97a9799 100755
--- a/pywii/pywii-tools/ecgenpriv.py
+++ b/pywii/pywii-tools/ecgenpriv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os
 import pywii as wii
diff --git a/pywii/pywii-tools/ecpriv2pub.py b/pywii/pywii-tools/ecpriv2pub.py
index 8981b47..bb85c60 100755
--- a/pywii/pywii-tools/ecpriv2pub.py
+++ b/pywii/pywii-tools/ecpriv2pub.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 import pywii as wii
diff --git a/pywii/pywii-tools/ecsign.py b/pywii/pywii-tools/ecsign.py
index 1209dfd..b7467f3 100755
--- a/pywii/pywii-tools/ecsign.py
+++ b/pywii/pywii-tools/ecsign.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 import pywii as wii
diff --git a/pywii/pywii-tools/extract.py b/pywii/pywii-tools/extract.py
index 7944007..da1f07c 100755
--- a/pywii/pywii-tools/extract.py
+++ b/pywii/pywii-tools/extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/extractdol.py b/pywii/pywii-tools/extractdol.py
index b7b7c4f..8e24de8 100755
--- a/pywii/pywii-tools/extractdol.py
+++ b/pywii/pywii-tools/extractdol.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import sys, os, os.path
 sys.path.append(os.path.realpath(os.path.dirname(sys.argv[0]))+"/../Common")
diff --git a/pywii/pywii-tools/extractfiles.py b/pywii/pywii-tools/extractfiles.py
index f7d8f73..b8d9934 100644
--- a/pywii/pywii-tools/extractfiles.py
+++ b/pywii/pywii-tools/extractfiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/getappldr.py b/pywii/pywii-tools/getappldr.py
index 602abf4..9989b12 100755
--- a/pywii/pywii-tools/getappldr.py
+++ b/pywii/pywii-tools/getappldr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/inject.py b/pywii/pywii-tools/inject.py
index d489e30..6a104db 100755
--- a/pywii/pywii-tools/inject.py
+++ b/pywii/pywii-tools/inject.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/injectdol.py b/pywii/pywii-tools/injectdol.py
index d06ebde..6f5e24b 100755
--- a/pywii/pywii-tools/injectdol.py
+++ b/pywii/pywii-tools/injectdol.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/partsetios.py b/pywii/pywii-tools/partsetios.py
index f2c81dd..21e21e9 100755
--- a/pywii/pywii-tools/partsetios.py
+++ b/pywii/pywii-tools/partsetios.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/rsapatch.py b/pywii/pywii-tools/rsapatch.py
index 75a9a6c..75b7d82 100755
--- a/pywii/pywii-tools/rsapatch.py
+++ b/pywii/pywii-tools/rsapatch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/saveinfo.py b/pywii/pywii-tools/saveinfo.py
index ba64b30..32d8705 100755
--- a/pywii/pywii-tools/saveinfo.py
+++ b/pywii/pywii-tools/saveinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tikfix.py b/pywii/pywii-tools/tikfix.py
index e790efe..045c045 100755
--- a/pywii/pywii-tools/tikfix.py
+++ b/pywii/pywii-tools/tikfix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tikinfo.py b/pywii/pywii-tools/tikinfo.py
index 8fe7ac3..5f53fb0 100755
--- a/pywii/pywii-tools/tikinfo.py
+++ b/pywii/pywii-tools/tikinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tmdfix.py b/pywii/pywii-tools/tmdfix.py
index 0258f5f..92525e7 100755
--- a/pywii/pywii-tools/tmdfix.py
+++ b/pywii/pywii-tools/tmdfix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tmdinfo.py b/pywii/pywii-tools/tmdinfo.py
index abcc30b..0c037b7 100755
--- a/pywii/pywii-tools/tmdinfo.py
+++ b/pywii/pywii-tools/tmdinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tmdupdatecr.py b/pywii/pywii-tools/tmdupdatecr.py
index 4fb787d..0778dc5 100755
--- a/pywii/pywii-tools/tmdupdatecr.py
+++ b/pywii/pywii-tools/tmdupdatecr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/tmdvers.py b/pywii/pywii-tools/tmdvers.py
index 9863b6a..1213779 100755
--- a/pywii/pywii-tools/tmdvers.py
+++ b/pywii/pywii-tools/tmdvers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/wadinfo.py b/pywii/pywii-tools/wadinfo.py
index 3eb16f9..c7ab162 100755
--- a/pywii/pywii-tools/wadinfo.py
+++ b/pywii/pywii-tools/wadinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/wadpack-boot2.py b/pywii/pywii-tools/wadpack-boot2.py
index 94fb95e..31a7323 100755
--- a/pywii/pywii-tools/wadpack-boot2.py
+++ b/pywii/pywii-tools/wadpack-boot2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/wadpack.py b/pywii/pywii-tools/wadpack.py
index 0f34182..bf562fe 100755
--- a/pywii/pywii-tools/wadpack.py
+++ b/pywii/pywii-tools/wadpack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii
diff --git a/pywii/pywii-tools/wadunpack.py b/pywii/pywii-tools/wadunpack.py
index f1a40c9..2f0c4cf 100755
--- a/pywii/pywii-tools/wadunpack.py
+++ b/pywii/pywii-tools/wadunpack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys, os, os.path
 import pywii as wii