diff --git a/conf/example.gitolite.rc b/conf/example.gitolite.rc index 78df455..b3b3361 100644 --- a/conf/example.gitolite.rc +++ b/conf/example.gitolite.rc @@ -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: diff --git a/src/00-easy-install.sh b/src/00-easy-install.sh index a9f5ecf..a9d8700 100755 --- a/src/00-easy-install.sh +++ b/src/00-easy-install.sh @@ -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