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

easy install: two rc file update bugs fixed

Browse source 
The "msysgit doesnt have 'comm'" commit (from 2 days ago), had 2 bugs:

  - (smaller) the "+++" which was part of the diff header was triggering
    a spurious rc file "new variables" warning, but there were no actual
    variables to update
  - (bigger) worse, the grep command, when there were no matches,
    coupled with the "set -e" to kill the program right there (ouch!)
This commit is contained in:
Sitaram Chamarty 2010-01-27 19:34:37 +05:30
parent 7afaafc54a
commit 98d73965b6
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

@ -307,7 +307,9 @@ Let's see if we can use that instead of the default one..."
# msysgit doesn't have "comm". diff is not ideal for our purposes # msysgit doesn't have "comm". diff is not ideal for our purposes
# because we only care about differences in one direction, but we'll # because we only care about differences in one direction, but we'll
# have to make do... # have to make do...
diff -u $tmpgli/glrc.old $tmpgli/glrc.new | grep '^+' > $tmpgli/glrc.comm13 set +e
diff -u $tmpgli/glrc.old $tmpgli/glrc.new | grep '^+.*\$' > $tmpgli/glrc.comm13
set -e
if [[ ! -s $tmpgli/glrc.comm13 ]] if [[ ! -s $tmpgli/glrc.comm13 ]]
then then
[[ $quiet == -q ]] || ${VISUAL:-${EDITOR:-vi}} $tmpgli/.gitolite.rc [[ $quiet == -q ]] || ${VISUAL:-${EDITOR:-vi}} $tmpgli/.gitolite.rc