easy-install: committed before testing? tsk tsk tsk!

This commit is contained in:
Sitaram Chamarty 2009-10-13 10:16:23 +05:30
parent 59e15e62a1
commit b3cab456d5
2 changed files with 4 additions and 4 deletions

View file

@ -95,8 +95,8 @@ $PERSONAL="";
# works), leave this setting as is. Otherwise, choose one of the
# alternatives, or write your own
$GIT_PATH=""
# $GIT_PATH="/opt/bin/"
$GIT_PATH="";
# $GIT_PATH="/opt/bin/";
# --------------------------------------
# per perl rules, this should be the last line in such a file:

View file

@ -245,6 +245,8 @@ then
sort < conf/example.gitolite.rc | perl -ne 'print "$1\n" if /^(\$\w+) *=/' > glrc.new
if diff -u glrc.old glrc.new
then
${VISUAL:-${EDITOR:-vi}} .gitolite.rc
else
prompt " looks like you're upgrading! I'm going to run your editor
with *both* the old and the new files (in that order), so you can add
in the lines pertaining to the variables shown with a '+' sign in the
@ -253,8 +255,6 @@ then
[It's upto you to figure out how your editor handles 2 filename
arguments, switch between them, copy lines, etc ;-)]"
${VISUAL:-${EDITOR:-vi}} .gitolite.rc conf/example.gitolite.rc
else
${VISUAL:-${EDITOR:-vi}} .gitolite.rc
fi
else
cp conf/example.gitolite.rc .gitolite.rc