Permalink
Browse files

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

  • Loading branch information...
1 parent 59e15e6 commit b3cab456d5882aa3f88af4fa33d756a7c4bdb547 Sitaram Chamarty committed Oct 13, 2009
Showing with 4 additions and 4 deletions.
  1. +2 −2 conf/example.gitolite.rc
  2. +2 −2 src/00-easy-install.sh
View
@@ -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
@@ -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

0 comments on commit b3cab45

Please sign in to comment.