From 8f69fa4fb98ea86bc9d0b4cd5069e647c0c9413b Mon Sep 17 00:00:00 2001
From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
Date: Thu, 13 Mar 2014 11:20:44 +0100
Subject: [PATCH] Moved git wrapper script to the package templates directory

---
 MANIFEST.in                                               | 1 +
 salt/modules/git.py                                       | 3 ++-
 scripts/salt-git-ssh => salt/templates/git/ssh-id-wrapper | 0
 setup.py                                                  | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename scripts/salt-git-ssh => salt/templates/git/ssh-id-wrapper (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index c9c5a72a862..b48b912f5f9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -13,3 +13,4 @@ recursive-include scripts *
 include conf/*
 recursive-include pkg *
 recursive-include salt *.jinja
+include salt/templates/git/ssh-id-wrapper
diff --git a/salt/modules/git.py b/salt/modules/git.py
index ee5abdeee92..01d131a2514 100644
--- a/salt/modules/git.py
+++ b/salt/modules/git.py
@@ -36,7 +36,8 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
 
     if identity:
         env = {
-            'GIT_SSH': 'salt-git-ssh',
+            'GIT_SSH': os.path.join(salt.utils.templates.TEMPLATE_DIRNAME,
+                                    'ssh-id-wrapper'),
             'GIT_IDENTITY': identity
         }
 
diff --git a/scripts/salt-git-ssh b/salt/templates/git/ssh-id-wrapper
similarity index 100%
rename from scripts/salt-git-ssh
rename to salt/templates/git/ssh-id-wrapper
diff --git a/setup.py b/setup.py
index 4245104d60e..803804826bb 100755
--- a/setup.py
+++ b/setup.py
@@ -465,7 +465,8 @@ SETUP_KWARGS = {'name': NAME,
                 'package_data': {'salt.templates': [
                                     'rh_ip/*.jinja',
                                     'debian_ip/*.jinja',
-                                    'virt/*.jinja'
+                                    'virt/*.jinja',
+                                    'git/*'
                                     ],
                                  'salt.daemons.flo': [
                                     '*.flo'
@@ -620,7 +621,6 @@ else:
         SETUP_KWARGS['scripts'].extend([
             'scripts/salt',
             'scripts/salt-cloud',
-            'scripts/salt-git-ssh',
             'scripts/salt-key',
             'scripts/salt-master',
             'scripts/salt-run',