X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/ddca05489313c16e5a0386d26d52568113f8ec46..b5f9ac877269649808ffa1c392ce5b35e31324f3:/setup.py

diff --git a/setup.py b/setup.py
index 81854d3..3f5ccb2 100755
--- a/setup.py
+++ b/setup.py
@@ -58,9 +58,8 @@ def __run_setup():
             ('share/stgit/templates', glob.glob('templates/*.tmpl')),
             ('share/stgit/examples', glob.glob('examples/*.tmpl')),
             ('share/stgit/examples', ['examples/gitconfig']),
-            ('share/stgit/contrib', ['contrib/diffcol.sh',
-                                     'contrib/stgbashprompt.sh',
-                                     'contrib/stgit-completion.bash']),
+            ('share/stgit/contrib', ['contrib/stgbashprompt.sh']),
+            ('share/stgit/completion', ['stgit-completion.bash'])
             ])
 
 # Check the minimum versions required
@@ -71,11 +70,8 @@ if sys.argv[1] in ['install', 'build']:
 # ensure readable template files
 old_mask = os.umask(0022)
 
-try:
-    version.write_builtin_version()
-    __run_setup()
-finally:
-    version.delete_builtin_version()
+version.write_builtin_version()
+__run_setup()
 
 # restore the old mask
 os.umask(old_mask)