I forgot I still have Solaris users...

change some obvious bashisms.  There may be more, however, so if you
find them, let me know.
This commit is contained in:
Sitaram Chamarty 2011-10-04 13:31:44 +05:30
parent 909bc43e70
commit 550982f69e
4 changed files with 13 additions and 13 deletions

View file

@ -6,7 +6,7 @@ die() { echo "$@"; exit 1; } >&2
# if GL_BINDIR was not passed in, find it # if GL_BINDIR was not passed in, find it
[ -z "$GL_BINDIR" ] && [ -z "$GL_BINDIR" ] &&
GL_BINDIR=$( perl -ne 'print($1), exit if /^command="(.+?)\/gl-(time|auth-command) /' < $HOME/.ssh/authorized_keys) GL_BINDIR=` perl -ne 'print($1), exit if /^command="(.+?)\/gl-(time|auth-command) /' < $HOME/.ssh/authorized_keys`
# GL_BINDIR still not known? we have a problem... # GL_BINDIR still not known? we have a problem...
[ -z "$GL_BINDIR" ] && { [ -z "$GL_BINDIR" ] && {
cat <<EOF2 cat <<EOF2
@ -41,10 +41,10 @@ GL_BYPASS_UPDATE_HOOK=1
export GL_RC export GL_RC
export GL_BINDIR export GL_BINDIR
export GL_ADMINDIR export GL_ADMINDIR
GL_RC=$(get_rc_val GL_RC 2>/dev/null) GL_RC=`get_rc_val GL_RC 2>/dev/null`
[ -z "$GL_RC" ] && die "hmm weird... GL_RC is undefined; ABORTING" [ -z "$GL_RC" ] && die "hmm weird... GL_RC is undefined; ABORTING"
GL_BINDIR=$( get_rc_val GL_BINDIR ) GL_BINDIR=` get_rc_val GL_BINDIR `
GL_ADMINDIR=$(get_rc_val GL_ADMINDIR) GL_ADMINDIR=`get_rc_val GL_ADMINDIR`
# and finally: # and finally:
git push "$@" git push "$@"

View file

@ -51,7 +51,7 @@ echo; echo "PLEASE READ WARNINGS IN SOURCE BEFORE USING!"; echo
export oldhome=$HOME export oldhome=$HOME
export oldpwd=$PWD export oldpwd=$PWD
export tmp=$(mktemp -d); export tmp=`mktemp -d`
trap "rm -rf $tmp" 0; trap "rm -rf $tmp" 0;
cd $tmp cd $tmp
@ -97,8 +97,8 @@ echo
echo "checking what pubkeys (if any) have push rights..." echo "checking what pubkeys (if any) have push rights..."
for f in `find .gitolite/keydir -name "*.pub" | sort` for f in `find .gitolite/keydir -name "*.pub" | sort`
do do
f=$(basename $f) f=`basename $f`
u=$(perl -e '$u = shift; $u =~ s/(\@[^.]+)?\.pub$//; print $u' $f) u=`perl -e '$u = shift; $u =~ s/(\@[^.]+)?\.pub$//; print $u' $f`
SSH_ORIGINAL_COMMAND=info $GL_BINDIR/gl-auth-command $u | grep R...W..gitolite-admin.$ > /dev/null && echo ' '$f SSH_ORIGINAL_COMMAND=info $GL_BINDIR/gl-auth-command $u | grep R...W..gitolite-admin.$ > /dev/null && echo ' '$f
done done
echo echo

View file

@ -24,7 +24,7 @@ get_rc_val() {
${0%/*}/gl-query-rc $1 ${0%/*}/gl-query-rc $1
} }
TEMPDIR=$(mktemp -d -t tmp.XXXXXXXXXX) TEMPDIR=`mktemp -d -t tmp.XXXXXXXXXX`
export TEMPDIR export TEMPDIR
trap "/bin/rm -rf $TEMPDIR" 0 trap "/bin/rm -rf $TEMPDIR" 0
@ -52,7 +52,7 @@ else
fi fi
export GL_RC export GL_RC
GL_RC=$(get_rc_val GL_RC 2>/dev/null) GL_RC=`get_rc_val GL_RC 2>/dev/null`
[ -z "$GL_RC" ] && GL_RC=$HOME/.gitolite.rc [ -z "$GL_RC" ] && GL_RC=$HOME/.gitolite.rc
if [ -f $GL_RC ] if [ -f $GL_RC ]
@ -101,9 +101,9 @@ fi
export GL_BINDIR export GL_BINDIR
export REPO_BASE export REPO_BASE
export GL_ADMINDIR export GL_ADMINDIR
GL_BINDIR=$( get_rc_val GL_BINDIR ) GL_BINDIR=` get_rc_val GL_BINDIR `
REPO_BASE=$( get_rc_val REPO_BASE ) REPO_BASE=` get_rc_val REPO_BASE `
GL_ADMINDIR=$(get_rc_val GL_ADMINDIR) GL_ADMINDIR=`get_rc_val GL_ADMINDIR`
# now we get to gitolite itself # now we get to gitolite itself

View file

@ -45,7 +45,7 @@ buildroot=$4;
[ -n "$1" ] && [ -z "$3" ] && die "I need all 3 directories or none at all" [ -n "$1" ] && [ -z "$3" ] && die "I need all 3 directories or none at all"
# supply default values to args 1, 2, and 3 if not provided # supply default values to args 1, 2, and 3 if not provided
[ -z "$1" ] && { [ -z "$1" ] && {
euid=$(perl -e 'print $>') euid=`perl -e 'print $>'`
if [ "$euid" = "0" ] if [ "$euid" = "0" ]
then then
set /usr/local/bin /var/gitolite/conf /var/gitolite/hooks set /usr/local/bin /var/gitolite/conf /var/gitolite/hooks