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

(rats! msysgit doesnt have 'comm'...)

Browse source
This commit is contained in:
Sitaram Chamarty 2010-01-25 14:36:02 +05:30
parent c3ec349721
commit 0fbe739772
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gl-easy-install
View file

@ -304,7 +304,10 @@ copy_gl() {
Let's see if we can use that instead of the default one..." Let's see if we can use that instead of the default one..."
< $tmpgli/.gitolite.rc perl -ne 'print "$1\n" if /^\s*(\$\w+) *=/' | sort > $tmpgli/glrc.old < $tmpgli/.gitolite.rc perl -ne 'print "$1\n" if /^\s*(\$\w+) *=/' | sort > $tmpgli/glrc.old
< conf/example.gitolite.rc perl -ne 'print "$1\n" if /^\s*(\$\w+) *=/' | sort > $tmpgli/glrc.new < conf/example.gitolite.rc perl -ne 'print "$1\n" if /^\s*(\$\w+) *=/' | sort > $tmpgli/glrc.new
comm -13 $tmpgli/glrc.old $tmpgli/glrc.new > $tmpgli/glrc.comm13 # msysgit doesn't have "comm". diff is not ideal for our purposes
# because we only care about differences in one direction, but we'll
# have to make do...
diff -u $tmpgli/glrc.old $tmpgli/glrc.new | grep '^+' > $tmpgli/glrc.comm13
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
@ -526,7 +529,7 @@ v_upgrade_glrc="
looks like you're upgrading, and there are some new rc variables that this looks like you're upgrading, and there are some new rc variables that this
version is expecting that your old rc file doesn't have. version is expecting that your old rc file doesn't have.
I'm going to run your editor with two filenames. The first is the example I'm going to run your \\\$EDITOR with two filenames. The first is the example
file from this gitolite version. It will have a block (code and comments) for file from this gitolite version. It will have a block (code and comments) for
each of the variables shown above with a '+' sign. each of the variables shown above with a '+' sign.
@ -536,7 +539,7 @@ it.
This is necessary; please dont skip this! This is necessary; please dont skip this!
[It's upto you to figure out how your editor handles 2 filename arguments, [It's upto you to figure out how your \\\$EDITOR handles 2 filename arguments,
switch between them, copy lines, etc ;-)] switch between them, copy lines, etc ;-)]
" "