changeset 473:a11cde0cdf5b

misc: Make the shell launcher use the same python interpreter than setup.py.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Sat, 14 Apr 2012 13:53:55 +0200
parents 813a869315dc
children e519f8f33cba
files setup.py src/sat.sh
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Sat Apr 14 11:09:31 2012 +0200
+++ b/setup.py	Sat Apr 14 13:53:55 2012 +0200
@@ -57,6 +57,8 @@
                     dest_line = 'DAEMON=""\n' #we want to launch sat as a daemon
                 elif ori_line.startswith('TAP_PATH='):
                     dest_line = 'TAP_PATH="%s/"\n' % run_dir
+                elif ori_line.startswith('PYTHON='):
+                    dest_line = 'PYTHON="%s"\n' % sys.executable
                 else:
                     dest_line = ori_line
                 sh_buffer += dest_line
--- a/src/sat.sh	Sat Apr 14 11:09:31 2012 +0200
+++ b/src/sat.sh	Sat Apr 14 13:53:55 2012 +0200
@@ -15,9 +15,10 @@
 fi
 
 NAME='sat'
+PYTHON='python'
 
 #We use python to parse config files
-eval `python<<PYTHONEND
+eval `"$PYTHON" << PYTHONEND
 from ConfigParser import SafeConfigParser
 from os.path import expanduser, join
 import sys