Use $GERRIT_SITE var for referencing to gerrit_testsite
Change 222679 tried to make this consistent by changing "sometimes ~/
and sometimes ../" to "always ~/", but ../ is the preferred way for
developers and ~/ for the quick start. So let's use the $GERRIT_SITE
variable everywhere instead and define it to ~/. The variable can
easily be changed to ../.
Change-Id: I2fc4ac8aa4374f25ed2679b85dcb17b80e8cffc4
diff --git a/Documentation/config-login-register.txt b/Documentation/config-login-register.txt
index 3dcef0a..cc2185b 100644
--- a/Documentation/config-login-register.txt
+++ b/Documentation/config-login-register.txt
@@ -57,7 +57,7 @@
find the url in the settings file.
----
- gerrit@host:~$ git config -f ~/gerrit_testsite/etc/gerrit.config gerrit.canonicalWebUrl
+ gerrit@host:~$ git config -f $GERRIT_SITE/etc/gerrit.config gerrit.canonicalWebUrl
http://localhost:8080/
gerrit@host:~$
----
@@ -70,9 +70,9 @@
proxy settings in the configuration file.
----
- gerrit@host:~$ git config -f ~/gerrit_testsite/etc/gerrit.config --add http.proxy http://proxy:8080
- gerrit@host:~$ git config -f ~/gerrit_testsite/etc/gerrit.config --add http.proxyUsername username
- gerrit@host:~$ git config -f ~/gerrit_testsite/etc/gerrit.config --add http.proxyPassword password
+ gerrit@host:~$ git config -f $GERRIT_SITE/etc/gerrit.config --add http.proxy http://proxy:8080
+ gerrit@host:~$ git config -f $GERRIT_SITE/etc/gerrit.config --add http.proxyUsername username
+ gerrit@host:~$ git config -f $GERRIT_SITE/etc/gerrit.config --add http.proxyPassword password
----
Refer to the Gerrit configuration guide for more detailed information about
diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt
index d9cecce..f9b09da 100644
--- a/Documentation/dev-readme.txt
+++ b/Documentation/dev-readme.txt
@@ -53,8 +53,9 @@
command to create a test site:
----
+ export GERRIT_SITE=~/gerrit_testsite
$(bazel info output_base)/external/local_jdk/bin/java \
- -jar bazel-bin/gerrit.war init --batch --dev -d ../gerrit_testsite
+ -jar bazel-bin/gerrit.war init --batch --dev -d $GERRIT_SITE
----
[[special_bazel_java_version]]
@@ -84,7 +85,7 @@
To shut down the daemon, run:
----
- ~/gerrit_testsite/bin/gerrit.sh stop
+ $GERRIT_SITE/bin/gerrit.sh stop
----
@@ -135,7 +136,7 @@
----
$(bazel info output_base)/external/local_jdk/bin/java \
- -jar bazel-bin/gerrit.war daemon -d ~/gerrit_testsite \
+ -jar bazel-bin/gerrit.war daemon -d $GERRIT_SITE \
--console-log
----
@@ -167,7 +168,7 @@
----
$(bazel info output_base)/external/local_jdk/bin/java \
- -jar bazel-bin/gerrit.war daemon -d ~/gerrit_testsite -s
+ -jar bazel-bin/gerrit.war daemon -d $GERRIT_SITE -s
----
NOTE: To learn why using `java -jar` isn't sufficient, see
diff --git a/Documentation/linux-quickstart.txt b/Documentation/linux-quickstart.txt
index bfebc6a..c2dcedb 100644
--- a/Documentation/linux-quickstart.txt
+++ b/Documentation/linux-quickstart.txt
@@ -43,7 +43,8 @@
From the command line, enter:
....
-java -jar gerrit*.war init --batch --dev -d ~/gerrit_testsite
+export GERRIT_SITE=~/gerrit_testsite
+java -jar gerrit*.war init --batch --dev -d $GERRIT_SITE
....
This command takes two parameters:
@@ -78,7 +79,7 @@
`localhost`. For example:
....
-git config --file ~/gerrit_testsite/etc/gerrit.config httpd.listenUrl 'http://localhost:8080'
+git config --file $GERRIT_SITE/etc/gerrit.config httpd.listenUrl 'http://localhost:8080'
....
== Restart the Gerrit service
@@ -87,7 +88,7 @@
changes to take effect:
....
-~/gerrit_testsite/bin/gerrit.sh restart
+$GERRIT_SITE/bin/gerrit.sh restart
....
== Viewing Gerrit
diff --git a/polygerrit-ui/README.md b/polygerrit-ui/README.md
index ac299e5..c8c8e4f 100644
--- a/polygerrit-ui/README.md
+++ b/polygerrit-ui/README.md
@@ -96,7 +96,7 @@
```sh
$(bazel info output_base)/external/local_jdk/bin/java \
-jar bazel-bin/gerrit.war daemon \
- -d ../gerrit_testsite \
+ -d $GERRIT_SITE \
--console-log \
--polygerrit-dev
```
