Unpack JARs for running servers in $site_path/tmp

Instead of unpacking a running server into ~/.gerritcodereview/tmp
only use that location for commands like init where there is no active
site. From gerrit.sh always use $site_path/tmp for the JARs to isolate
servers that run on the same host under the same UNIX user account.

Change-Id: I688490ffbbf70312767bb766dc7ccbea52401ad1
This commit is contained in:
Shawn O. Pearce
2012-05-09 15:09:21 -07:00
parent 0ad46d4d12
commit 450f0cc262
2 changed files with 34 additions and 25 deletions

View File

@@ -176,6 +176,8 @@ test -r "$GERRIT_CONFIG" || {
GERRIT_PID="$GERRIT_SITE/logs/gerrit.pid"
GERRIT_RUN="$GERRIT_SITE/logs/gerrit.run"
GERRIT_TMP="$GERRIT_SITE/tmp"
export GERRIT_TMP
##################################################
# Check for JAVA_HOME
@@ -492,6 +494,7 @@ case "$ACTION" in
echo " GERRIT_SITE = $GERRIT_SITE"
echo " GERRIT_CONFIG = $GERRIT_CONFIG"
echo " GERRIT_PID = $GERRIT_PID"
echo " GERRIT_TMP = $GERRIT_TMP"
echo " GERRIT_WAR = $GERRIT_WAR"
echo " GERRIT_FDS = $GERRIT_FDS"
echo " GERRIT_USER = $GERRIT_USER"