diff --git a/src/gl-easy-install b/src/gl-easy-install index d12f98a..90a4061 100755 --- a/src/gl-easy-install +++ b/src/gl-easy-install @@ -336,9 +336,10 @@ run_install() { prompt "installing/upgrading..." "$v_ignore_stuff" - # extract the GL_ADMINDIR and REPO_BASE locations + # extract the GL_ADMINDIR, REPO_BASE and GIT_PATH locations GL_ADMINDIR=$(ssh -p $port $user@$host "perl -e 'do \".gitolite.rc\"; print \$GL_ADMINDIR'") REPO_BASE=$( ssh -p $port $user@$host "perl -e 'do \".gitolite.rc\"; print \$REPO_BASE'") + GIT_PATH=$( ssh -p $port $user@$host "perl -e 'do \".gitolite.rc\"; print \$GIT_PATH'") # determine if this is an upgrade; we decide based on whether a file # called $GL_ADMINDIR/conf/gitolite.conf exists on the remote side. We @@ -409,6 +410,7 @@ setup_pta() { # space around the "=" in the second and third lines. echo "cd $REPO_BASE/gitolite-admin.git +PATH=$PATH:$GIT_PATH GIT_WORK_TREE=$GL_ADMINDIR git add conf/gitolite.conf keydir GIT_WORK_TREE=$GL_ADMINDIR git diff --cached --quiet || GIT_WORK_TREE=$GL_ADMINDIR git commit -am start " | ssh -p $port $user@$host