Merge commit '7738e6277f5f8c281b8d6e02a2989b55f38415a8'

zanata · Dec 3, 2015 · 0bbd502 · 0bbd502
2 parents adb69b9 + 7738e62
commit 0bbd502
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 43 deletions.
diff --git a/docs/installation/linux-installation.md b/docs/installation/linux-installation.md
@@ -1,74 +1,140 @@
 ## RHEL 7
+There are two ways to install zanata-client, via `0install` or `yum`.
 
+*Note: If you have installed `zanata-cli` previously through different method, you need to uninstall that*
+
+### With 0install
 1. Install EPEL repository for RHEL 7
-```
-sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-```
 
-2. Install 0install 
-```
-sudo yum -y install 0install
-```
+        sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
+2. Install `0install`
+
+        sudo yum -y install 0install
+
+3. Use `zanata-cli` as alias: 
+
+        0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml
 
-3. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`.
-4. Now you can run `zanata-cli --help` for more options.
+4. It should be done now. Run `zanata-cli --help` for the usage of the client.
+
+### With yum
+1. Install `epel-zanata` repo
+
+        cd /etc/yum.repos.d ; sudo wget https://repos.fedorapeople.org/dchen/zanata/epel-zanata.repo
+
+2. Install package `zanata-cli-bin`
+
+        sudo yum -y zanata-cli-bin
+
+3. It should be done now. Run `zanata-cli --help` for the usage of the client.
 
 ## RHEL 6
+There are two ways to install zanata-client, via `0install` or `yum`.
+
+*Note: If you have installed `zanata-cli` previously through different method, you need to uninstall that*
+
+### With 0install
+1. Download and extract `0install` binary package
+   a. for 64-bit machine (such as x86_64)
+
+        cd /tmp; wget https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-x86_64-2.10.tar.bz2
+        tar xjvf 0install-linux-x86_64-2.10.tar.bz2
+        cd 0install-linux-x86_64-2.10
+
+   b. for 32-bit machine (such as i486)
+
+        cd /tmp; wget https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-i486-2.10.tar.bz2
+        tar xjvf 0install-linux-i486-2.10.tar.bz2
+        cd 0install-linux-i486-2.10
+
+2. Install `libcurl` if you have not
+
+        sudo yum -y install libcurl
+
+
+3. Install `0install`
+
+        ./install.sh 
+
+4. Use `zanata-cli` as alias: 
+
+        0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml
+
+5. It should be done now. Run `zanata-cli --help` for the usage of the client.
 
-1. Download binary package from [0Install v2.10 x86_64](https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-x86_64-2.10.tar.bz2) or [0Install v2.10 i486](https://downloads.sourceforge.net/project/zero-install/0install/2.10/0install-linux-i486-2.10.tar.bz2)
-2. Unpack it, and run the `install.sh` script inside. You'll need libcurl installed (most systems have it by default).
-3. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`.
-4. Now you can run `zanata-cli --help` for more options.
+### With yum
+1. Install `epel-zanata` repo
+
+        cd /etc/yum.repos.d ; sudo wget https://repos.fedorapeople.org/dchen/zanata/epel-zanata.repo
+
+2. Install package `zanata-cli-bin`
+
+        sudo yum -y zanata-cli-bin
+
+3. It should be done now. Run `zanata-cli --help` for the usage of the client.
 
 ## Fedora
+There are two ways to install zanata-client, via `0install` or `dnf`.
 
-The recommend way to install is though 0install:
+*Note: If you have installed `zanata-cli` previously through different method, you need to uninstall that*
 
+### 0install
 1. Install 0install
-```
-sudo yum -y install 0install
-```
 
-2. Setup alias: `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml`.
-3. Now you can run `zanata-cli --help` for more options.
+        sudo yum -y install 0install
 
-You can also install using yum/dnf:
+2. Use `zanata-cli` as alias: 
 
-```
-sudo yum -y install zanata-client
-```
+        0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml
+
+3. It should be done now. Run `zanata-cli --help` for the usage of the client.
+
+### dnf
+1. Install `zanata-client`
+
+        sudo yum -y install zanata-client
 
-*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.*
 
 
 ## Debian based distro
+*Note: If you have installed `zanata-cli` previously through different method, you need to uninstall that*
 
-1. Install 0Install: `apt-get install zeroinstall-injector`.
-2. Install Java runtime: `apt-get install openjdk-7-jre`.
-3. Run `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml` to setup alias.
-4. Now you can run `zanata-cli --help` for more options.
+1. Install 0install
 
-*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.*
+        sudo yum -y install 0install
 
+2. Install Java runtime: 
+
+        apt-get install openjdk-8-jre
+
+3. Use `zanata-cli` as alias: 
+
+        0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml
+
+4. It should be done now. Run `zanata-cli --help` for the usage of the client.
 
 ## Others
+*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.*
 
 1. Follow 0Install in [0Install for Linux](http://0install.net/install-linux.html).
-2. Install Java JRE (1.7 onwards) from [OpenJDK installation](http://openjdk.java.net/install/index.html)
-3. Run `0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml` to setup alias.
-4. Now you can run `zanata-cli --help` for more options.
 
-*Note: If you have installed `zanata-cli` previously through another method, you need to uninstall that for this to work.*
+        sudo yum -y install 0install
+
+2. Install Java JRE (1.8 onwards) from [OpenJDK installation](http://openjdk.java.net/install/index.html)
+3. Use `zanata-cli` as alias: 
+
+        0install -c add zanata-cli http://zanata.org/files/0install/zanata-cli.xml
+
+4. It should be done now. Run `zanata-cli --help` for the usage of the client.
+
+## 0install Useful command
 
+ * Run Zanata-CLI without alias
 
-### Useful command
+        0launch http://zanata.org/files/0install/zanata-cli.xml {command}
 
-**Run Zanata-CLI without alias**
-```
-0launch http://zanata.org/files/0install/zanata-cli.xml {command}
-```
+ * Update Zanata-CLI manually
+
+        0install update http://zanata.org/files/0install/zanata-cli.xml
 
-**Update Zanata-CLI manually**
-```
-0install update http://zanata.org/files/0install/zanata-cli.xml
-```
diff --git a/zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java b/zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
@@ -76,7 +76,6 @@ public void testGetContributorStatistics() {
                         "pahuang", "2014-10-01..2014-11-10", false);
         assertThat(statistics, Matchers.hasKey("pahuang"));
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,6 @@ public void testGetContributorStatistics() { @@
                             "pahuang", "2014-10-01..2014-11-10", false);
             assertThat(statistics, Matchers.hasKey("pahuang"));
         }
     }