opendev/gerrit
Code Issues Proposed changes

Merge "Fix 'gerrit.sh restart' for relative paths"

Browse Source
This commit is contained in:
Shawn Pearce
2013-03-21 05:42:52 +00:00
committed by Gerrit Code Review
parent f89058dc70 885799aecd
commit 18b133fde4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
View File

@@ -175,6 +175,7 @@ if test -z "$GERRIT_SITE" ; then
exit 1 exit 1
fi fi
INITIAL_DIR=`pwd`
if cd "$GERRIT_SITE" ; then if cd "$GERRIT_SITE" ; then
GERRIT_SITE=`pwd` GERRIT_SITE=`pwd`
else else
@@ -478,12 +479,17 @@ case "$ACTION" in
restart) restart)
GERRIT_SH=$0 GERRIT_SH=$0
if test -f "$GERRIT_SH" ; then
: OK
else
GERRIT_SH="$INITIAL_DIR/$GERRIT_SH"
if test -f "$GERRIT_SH" ; then if test -f "$GERRIT_SH" ; then
: OK : OK
else else
echo >&2 "** ERROR: Cannot locate gerrit.sh" echo >&2 "** ERROR: Cannot locate gerrit.sh"
exit 1 exit 1
fi fi
fi
$GERRIT_SH stop $* $GERRIT_SH stop $*
sleep 5 sleep 5
$GERRIT_SH start $* $GERRIT_SH start $*