deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

easy install seemed to out of the GIT_PATH loop

Browse source 
for some reason, I apparently did not test easy install with a
non-standard path!  Fixed...
This commit is contained in:
Sitaram Chamarty 2010-03-09 21:57:26 +05:30
parent 08811fa9c2
commit 369ff45d92
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl-easy-install
View file

@ -336,9 +336,10 @@ run_install() {
prompt "installing/upgrading..." "$v_ignore_stuff" 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'") 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'") 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 # 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 # 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. # space around the "=" in the second and third lines.
echo "cd $REPO_BASE/gitolite-admin.git 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 add conf/gitolite.conf keydir
GIT_WORK_TREE=$GL_ADMINDIR git diff --cached --quiet || GIT_WORK_TREE=$GL_ADMINDIR git commit -am start GIT_WORK_TREE=$GL_ADMINDIR git diff --cached --quiet || GIT_WORK_TREE=$GL_ADMINDIR git commit -am start
" | ssh -p $port $user@$host " | ssh -p $port $user@$host