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

gl-setup should not assume $PWD is writable

Browse source 
noticed by idl0r when running it via cfengine
This commit is contained in:
Sitaram Chamarty 2010-11-04 13:24:41 +05:30
parent 04d68fe3e9
commit 7ddc3ea4c6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gl-setup
View file

@ -21,6 +21,9 @@ GL_PACKAGE_CONF=/tmp/share/gitolite/conf
die() { echo "$@"; exit 1; } die() { echo "$@"; exit 1; }
TEMPDIR=$(mktemp -d)
export TEMPDIR
trap "/bin/rm -rf $TEMPDIR" 0
if [ -n "$GITOLITE_HTTP_HOME" ] if [ -n "$GITOLITE_HTTP_HOME" ]
then then
@ -40,10 +43,10 @@ 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 > .newvars perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > $TEMPDIR/.newvars
perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc | sort > .oldvars perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc | sort > $TEMPDIR/.oldvars
comm -23 .newvars .oldvars > .diffvars comm -23 $TEMPDIR/.newvars $TEMPDIR/.oldvars > $TEMPDIR/.diffvars
if [ -s .diffvars ] if [ -s $TEMPDIR/.diffvars ]
then then
cp $GL_PACKAGE_CONF/example.gitolite.rc $HOME/.gitolite.rc.new cp $GL_PACKAGE_CONF/example.gitolite.rc $HOME/.gitolite.rc.new
echo new version of the rc file saved in $HOME/.gitolite.rc.new echo new version of the rc file saved in $HOME/.gitolite.rc.new
@ -51,10 +54,9 @@ then
echo please update $HOME/.gitolite.rc manually if you need features echo please update $HOME/.gitolite.rc manually if you need features
echo controlled by any of the following variables: echo controlled by any of the following variables:
echo ---- echo ----
sed -e 's/^/ /' < .diffvars sed -e 's/^/ /' < $TEMPDIR/.diffvars
echo ---- echo ----
fi fi
rm -f .newvars .oldvars .diffvars
else else
[ -n "$GITOLITE_HTTP_HOME" ] || [ -n "$pubkey_file" ] || die "looks like first run -- I need a pubkey file" [ -n "$GITOLITE_HTTP_HOME" ] || [ -n "$pubkey_file" ] || die "looks like first run -- I need a pubkey file"
[ -z "$GITOLITE_HTTP_HOME" ] || [ -n "$admin_name" ] || die "looks like first run -- I need an admin name" [ -z "$GITOLITE_HTTP_HOME" ] || [ -n "$admin_name" ] || die "looks like first run -- I need an admin name"