Fix: some issues of installation

Author: ryanfwy

README.md

@@ -93,19 +93,19 @@ source .env/bin/activate
 For CPU only:
 
 ```bash
-pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0
+pip install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0
 ```
 
 For GPU:
 
 ```bash
-pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0
+pip install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0
 ```
 
 2）The rest of environments:
 
 ```bash
-pip3 install -r requirements.txt
+pip install -r requirements.txt
 ```
 
 ### 4-2. Install Dependencies (Quicker Way)

README_zh.md

@@ -93,19 +93,19 @@ source .env/bin/activate
 若只在 CPU 环境运行，则：
 
 ```bash
-pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0
+pip install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0
 ```
 
 若在 GPU 环境运行，则：
 
 ```bash
-pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0
+pip install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0
 ```
 
 2）剩余部分依赖环境：
 
 ```bash
-pip3 install -r requirements.txt
+pip install -r requirements.txt
 ```
 
 ### 4-2. 安装依赖包（懒人版）

installation.sh

@@ -1,35 +1,43 @@
+#!/bin/bash
+
 # 0. Check python and pip3
-(python3 -V && pip3 -V) &>/dev/null;
+(python3 -V && pip3 -V) &>/dev/null
 if [[ $? -ne 0 ]]; then
-    echo "Error: please check whether 'python3' and 'pip3' is valid";
-    exit 1;
+    echo "Error: please check whether 'python3' and 'pip3' is valid"
+    exit 1
 fi
 
 # 1. Create virtual environment
-conda -V &>/dev/null;
-if [[ $? -eq 0 ]]; then
-    echo "1. Creating conda environment: image_quality";
-    conda create --name image_quality python=3.6;
-    source activate image_quality;
+conda -V &>/dev/null
+is_conda=$?
+if [[ $is_conda -eq 0 ]]; then
+    echo "1. Creating conda environment: image_quality"
+    conda create -y --name image_quality python=3.6
+    source activate image_quality
 else
     echo "1. Creating virtual environment: .env"
     python3 -m venv .env
     source .env/bin/activate
 fi
 
 # 2. Install tensorflow backend
-nvidia-smi &>/dev/null;
-if [[ $? -eq 0 ]]; then
-    echo "2. Installing backend: tensorflow-gpu==1.12.0";
-    pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0;
+nvidia-smi &>/dev/null
+is_nvidia=$?
+if [[ $is_nvidia -eq 0 ]]; then
+    echo "2. Installing backend: tensorflow-gpu==1.12.0"
+    pip install numpy==1.15.4 Keras==2.2.4 tensorflow-gpu==1.12.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
 else
-    echo "2. Installing backend: tensorflow==1.12.0";
-    pip3 install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0;
+    echo "2. Installing backend: tensorflow==1.12.0"
+    pip install numpy==1.15.4 Keras==2.2.4 tensorflow==1.12.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
 fi
 
 # 3. Install dependencies
-echo "3. Installing the rest dependencies";
-pip3 install -r requirements.txt;
+echo "3. Installing the rest dependencies"
+pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # 4. Deactivate
-deactivate;
+if [[ $is_conda -eq 0 ]]; then
+    source deactivate
+else
+    deactivate
+fi