gl-setup: Replace similar long one-liners with functions
This commit is contained in:
parent
b0d641ef48
commit
21a00bd6a9
14
src/gl-setup
14
src/gl-setup
|
@ -42,8 +42,11 @@ fi
|
||||||
|
|
||||||
if [ -f $HOME/.gitolite.rc ]
|
if [ -f $HOME/.gitolite.rc ]
|
||||||
then
|
then
|
||||||
perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > $TEMPDIR/.newvars
|
print_rc_vars() {
|
||||||
perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc | sort > $TEMPDIR/.oldvars
|
perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $1 | sort
|
||||||
|
}
|
||||||
|
print_rc_vars $GL_PACKAGE_CONF/example.gitolite.rc > $TEMPDIR/.newvars
|
||||||
|
print_rc_vars $HOME/.gitolite.rc > $TEMPDIR/.oldvars
|
||||||
comm -23 $TEMPDIR/.newvars $TEMPDIR/.oldvars > $TEMPDIR/.diffvars
|
comm -23 $TEMPDIR/.newvars $TEMPDIR/.oldvars > $TEMPDIR/.diffvars
|
||||||
if [ -s $TEMPDIR/.diffvars ]
|
if [ -s $TEMPDIR/.diffvars ]
|
||||||
then
|
then
|
||||||
|
@ -81,8 +84,11 @@ fi
|
||||||
|
|
||||||
gl-install -q
|
gl-install -q
|
||||||
|
|
||||||
GL_ADMINDIR=` cd $HOME;perl -e 'do ".gitolite.rc"; print $GL_ADMINDIR'`
|
get_rc_val() {
|
||||||
REPO_BASE=` cd $HOME;perl -e 'do ".gitolite.rc"; print $REPO_BASE' `
|
perl -e "do '$HOME/.gitolite.rc'; print $1"
|
||||||
|
}
|
||||||
|
GL_ADMINDIR=$(get_rc_val '$GL_ADMINDIR')
|
||||||
|
REPO_BASE=$( get_rc_val '$REPO_BASE' )
|
||||||
|
|
||||||
[ -f $GL_ADMINDIR/conf/gitolite.conf ] || {
|
[ -f $GL_ADMINDIR/conf/gitolite.conf ] || {
|
||||||
cat <<EOF > $GL_ADMINDIR/conf/gitolite.conf
|
cat <<EOF > $GL_ADMINDIR/conf/gitolite.conf
|
||||||
|
|
Loading…
Reference in a new issue