# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: daniel@daniel-watkins.co.uk-20080722154056-\
#   8utciir5j0wool3y
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 2831a5d5221ef7120a6b776ac3a9e9d145bafee0
# timestamp: 2008-07-22 16:41:44 +0100
# source_branch: http://bzr.daniel-watkins.co.uk/bzr/250826
# base_revision_id: pqm@pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
# 
# Begin patch
=== modified file 'setup.py'
--- setup.py	2008-07-17 21:28:49 +0000
+++ setup.py	2008-07-22 15:40:56 +0000
@@ -123,6 +123,19 @@
                 print "Created:", batch_path
             except Exception, e:
                 print "ERROR: Unable to create %s: %s" % (batch_path, e)
+        else:
+            import shutil
+            lib_path = self.distribution.get_command_obj('install').install_lib
+            bzr_script_path = os.path.join(self.install_dir, "bzr")
+            new_script_path = os.path.join(self.install_dir, "bzr-script")
+            os.rename(bzr_script_path, new_script_path)
+            bzr = open(bzr_script_path, 'w')
+            bzr.write('#!/bin/sh\n'
+                      'PYTHONPATH=%s:$PYTHONPATH %s "$@"' % (lib_path,
+                                                             new_script_path))
+            bzr.close()
+            shutil.copystat(new_script_path, bzr_script_path)
+
 
     def _quoted_path(self, path):
         if ' ' in path:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf1iIckAAcj/gARQEAB/5///
dkHEpL////BQBCZ3tK83jp2cbadhJKaCYp+pqn5GRqmTzRRmmmUaPKaNNP1TTyn6oaBJSTJp5Min
mimnlADQGgAAAABJJoQpsmmqb0AnqZJkZB6mIeoNGjRobUGUobUDQPUZGgBoDJkDRiAAASQpqTwB
MmTUTZQ09TQB6gyaDQACEQ/py3SN+PQzR24lwuvcrM86eMntojaBwHsughNUlQgIQTH6mJ9znR9X
rPCtmY/N5hDIw6ijPE0VGHms1HRfa3hDDvhBp9a4pRX4jzXxDy6bvHV26I27XhjaGb4XY8iU6uNy
gZLZd0RIyhnlu8tXseevxalnLXMDqtrKuaUW4xltLz0AoHcCsE5zLqk10zU3CVvhQ2pAUuEi+Aik
WyZzI9VNmnYh4x1C4vjGPjULgCZdh1nhIIFqGOcRAiLntGIFP8N3OKyw5WWJerncxZK2lliSn3Q2
F5aRqFiWD4q73suYnKTUTlnVtBTvIWdRMJyvqe+8yhxgqIP6oKD1p7YKjMpy1ZUx6Zgg2nSLI5RS
GGMUCECdUaCy6+DVjWjVllYpjDyFJi8rLDEUGgrErMzUW2zV3WDUwVhLBRoRJc5hQEMKYhDykrKq
Ew31ONaIYmWFypqIECQuJR7cQ41XGmKqiYgYWyGo8nJqSJAzzF1kdxVshFlFcGGRSrEWhKsybylh
bGLA6cZZSNg/nyqDNv2dx6MrygUPB/rHnS7lyKqpEzN5zQcw5lBzH8eRgW4zjbUZFSiDNCbmTMor
JLfFmGZrYzSRBrP91kV1E5MG+IHpnacKRLvvnRkjxMOBfvKl8Hym0lYcPp3nq2eMcvZ5J2DhlpvN
oby8a0t0KvYX2aCufiC/lz7kGa3qnW3ErUJoKQg0JcrTOm4m2cy1XGQq6thZXrdJwG7c50Gcxdlk
xN6FPhjaGEO7y1P1G7ZQn6QKGScv5XHemRNkqkjCyUnVMQNAeGZqx3WrdImUzF53mBoHpvUlTF57
Qtn8rURGWtx3YOTocqUvNtzUnLeAMktRuKhOYpj0YWFf0C+5wOvFcc5UYVslggvNougB434fXk24
bhdPNgaHYlStYXAXaK2AhpFNOlFRsZmdUatGCMVc8OKsOAsuZVLw68MhOknlIj8LHHGY3MD8pppm
DShfKV8cdCSgCpTMi9QXJpzJZ7+RWiiKhB694p5GCZoOWckUxZhLRGoMs9996iI1jGZBqJHNd1Lp
cPeNkgrCqkWWjSGWg4mcJB3Za53RTwvrZRTlPtQaa1GNoPMZhlw6nZJ12qMaBm6DZUBRrdY9pn0w
abZExQTbquUCbYrVcXYA/GoJ2s72T4cdkFEgMzfrEwqouxKKAV9hOSGmAegL0zKTKllWEEy6V2sl
r0KEJa+8XWRfNVp6eBvYMyXAWOnKovimXYX+bU6ZPB4UbZaHKLkH/F3JFOFCQ/WIhyQ=