Giving up on Python 2.5 support

1 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index e58b9b0..a09f992 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ FOPTIONS=$(OPTIONS) -h $(ALIVES)
 .PHONY: alive deploy clean pink nuke
 
 $(ALIVES) alive:
-	pssh $(OPTIONS) -h $(HOSTS) "uname" -i | grep "\[SUCCESS\]"\
-		| awk '{print $$4}' > $(ALIVES)
+	pssh $(OPTIONS) -h $(HOSTS) 'python2 --version 2>&1 | grep -E "(2\.6|2\.7)"'\
+	| grep "\[SUCCESS\]"\ | awk '{print $$4}' > $(ALIVES)
 
-deploy_libs: requests simplejson
+deploy_libs: requests
 
 deploy_client: lastfm.py process.py
 
@@ -28,7 +28,7 @@ distclean:
 	rm -f alive.txt deploy_client deploy_libs
 
 ping: $(ALIVES)
-	pssh $(FOPTIONS) "uname"
+	pssh $(FOPTIONS) 'python2 --version 2>&1 | grep -E "(2\.6|2\.7)"'
 
 nuke:
 	pnuke $(OPTIONS) -h $(HOSTS) "python"