hotfix - add gui option & optimize install script (#195)

* hotfix - add option to bypass gui installation

* hotfix - don't install recommended packages with apt-get

* hotfix - add details in the README

* hotfix - take out script_tools and add bypass for gui stuff

* hotfix - add in the README & remove artifacts

* hotfix - change the name of the platform to the adequate one

* hotfix - change github references for testing purposes

* hotfix - remove the dependency checker in the gopigo3

* hotfix - remove artifact from script_tools installation

* hotfix - rename a function

* hotfix - assign correct exit codes

* hotfix - remove unnecessary option for minimal ist

* Revert "hotfix - change github references for testing purposes"

This reverts commit a92f877.

* hotfix - change the wording in the README

Author: RobertLucian

Install/README.md

@@ -31,23 +31,42 @@ An example using options appended to the command can be:
 curl -kL dexterindustries.com/update_gopigo3 | bash -s --user-local --no-update-aptget --no-dependencies
 ```
 
-#### Command Options
+## Command Options
 
 The options that can be appended to this command are:
 
+* `--no-update-aptget` - to skip using `sudo apt-get update` before installing dependencies. For this to be useful, `--no-dependencies` has to be not used. Applies to RFR_Tools and the GoPiGo3.
+* `--bypass-rfrtools` - skips installing RFR_Tools completely.
+    * `--bypass-python-rfrtools` - skips installing/updating the python package for  [RFR_Tools](https://github.com/DexterInd/RFR_Tools).
+    * `--bypass-gui-installation` - skips installing the GUI packages/dependencies from [RFR_Tools](https://github.com/DexterInd/RFR_Tools).
 * `--no-dependencies` - skip installing any dependencies for the GoPiGo3. It's supposed to be used on each consecutive update after the initial install has gone through.
-* `--no-update-aptget` - to skip using `sudo apt-get update` before installing dependencies. For this to be useful, `--no-dependencies` has to be not used.
-* `--bypass-rfrtools` - skip installing RFR_Tools altogether.
-* `--bypass-python-rfrtools` - skips installing/updating the python package for  [RFR_Tools](https://github.com/DexterInd/RFR_Tools).
 * `--user-local` - install the python package for the GoPiGo3 in the home directory of the user. This doesn't require any special read/write permissions: the actual command used is (`python setup.py install --force --user`).
 * `--env-local` - install the python package for the GoPiGo3 within the given environment without elevated privileges: the actual command used is (`python setup.py install --force`).
 * `--system-wide` - install the python package for the GoPiGo3 within the sytem-wide environment with `sudo`: the actual command used is (`sudo python setup.py install --force`).
 
 Important to remember is that `--user-local`, `--env-local` and `--system-wide` options are all mutually-exclusive - they cannot be used together.
 As a last thing, different versions of it can be pulled by appending a corresponding branch name or tag.
 
+## Minimal Installation
+
+Now, if you only want the absolute minimum in order to get going with the GoPiGo3, you can run this command:
+```bash
+curl -kL dexterindustries.com/update_gopigo3 | bash -s -- --bypass-gui-installation
+```
+
+This will only install the GoPiGo3 dependencies and nothing else. You still can use options such as `--user-local` or `--env-local` if you are working with a different kind of environment. Keep in mind that `--system-wide` is selected by default.
+
+## Subsequent Updates
+
+If the GoPiGo3 has been installed either by using the full command or the one for the minimal installation, this means you have all the packages installed already and all dependencies put in. Therefore, on subsequent installation, you can skip installing any dependency and instead just reinstall the python package of the GoPiGo3. To do this, you can run this command:
+```bash
+curl -kL dexterindustries.com/update_gopigo3| bash -s -- --bypass-rfrtools --no-dependencies
+```
+
+Or if this is too complex, you can always stick to the command meant for the full installation or the minimal one.
+
 ## Test and Troubleshooting
-You can see [the test and troubleshooting section on the GoPiGo3, including detailed information about updating the firmwaer, here.](https://www.dexterindustries.com/GoPiGo/get-started-with-the-gopigo3-raspberry-pi-robot/test-and-troubleshoot-the-gopigo3-raspberry-pi-robot/)
+You can see [the test and troubleshooting section on the GoPiGo3, including detailed information about updating the firmware, here.](https://www.dexterindustries.com/GoPiGo/get-started-with-the-gopigo3-raspberry-pi-robot/test-and-troubleshoot-the-gopigo3-raspberry-pi-robot/)
 
 ## License
 

Install/install.sh

@@ -17,17 +17,11 @@ check_root_user() {
 }
 
 install_dependencies() {
-
-    # the sudo apt-get update is already done by the
-    # script_tools installer in update_gopigo3.sh
-
     feedback "Installing Dependencies for the GoPiGo3"
 
-    # for python3
-    sudo apt-get install python3-pip python3-numpy python3-curtsies -y
-
-    # for python2
-    sudo apt-get install python-pip python-numpy python-curtsies -y
+    sudo apt-get install --no-install-recommends -y \
+        python3-pip python3-numpy python3-curtsies \
+        python-pip python-numpy python-curtsies
 
     feedback "Dependencies installed for the GoPiGo3"
 }

Install/update_gopigo3.sh

@@ -23,7 +23,7 @@ check_if_run_with_pi() {
   ## if not running with the pi user then exit
   if [ $(id -ur) -ne $(id -ur pi) ]; then
     echo "GoPiGo3 installer script must be run with \"pi\" user. Exiting."
-    exit 7
+    exit 6
   fi
 }
 
@@ -35,6 +35,7 @@ parse_cmdline_arguments() {
   updaterepo=true
   install_rfrtools=true
   install_pkg_rfrtools=true
+  install_rfrtools_gui=true
 
   # the following 3 options are mutually exclusive
   systemwide=true
@@ -61,6 +62,9 @@ parse_cmdline_arguments() {
       --bypass-python-rfrtools)
         install_pkg_rfrtools=false
         ;;
+      --bypass-gui-installation)
+        install_rfrtools_gui=false
+        ;;
       --user-local)
         userlocal=true
         systemwide=false
@@ -115,40 +119,45 @@ parse_cmdline_arguments() {
   ([[ $updaterepo = "true" ]] && echo "  --no-update-aptget=false") || echo "  --no-update-aptget=true"
   ([[ $install_rfrtools = "true" ]] && echo "  --bypass-rfrtools=false") || echo "  --bypass-rfrtools=true"
   ([[ $install_pkg_rfrtools = "true" ]] && echo "  --bypass-python-rfrtools=false") || echo "  --bypass-python-rfrtools=true"
+  ([[ $install_rfrtools_gui = "true" ]] && echo "  --bypass-gui-installation=false") || echo "  --bypass-gui-installation=true"
   echo "  --user-local=$userlocal"
   echo "  --env-local=$envlocal"
   echo "  --system-wide=$systemwide"
 
-  # in case the following packages are not installed and `--no-dependencies` option has been used
-  if [[ $installdependencies = "false" || $install_rfrtools = "false" ]]; then
-    command -v git >/dev/null 2>&1 || { echo "This script requires \"git\" but it's not installed. Don't use --no-dependencies option. Exiting." >&2; exit 1; }
-    command -v python >/dev/null 2>&1 || { echo "Executable \"python\" couldn't be found. Don't use --no-dependencies option. Exiting." >&2; exit 2; }
-    command -v python3 >/dev/null 2>&1 || { echo "Executable \"python3\" couldn't be found. Don't use --no-dependencies option. Exiting." >&2; exit 3; }
-    command -v pip >/dev/null 2>&1 || { echo "Executable \"pip\" couldn't be found. Don't use --no-dependencies option. Exiting." >&2; exit 4; }
-    command -v pip3 >/dev/null 2>&1 || { echo "Executable \"pip3\" couldn't be found. Don't use --no-dependencies option. Exiting." >&2; exit 5; }
-  fi
-
   # create rest of list of arguments for rfrtools call
   rfrtools_options+=("$selectedbranch")
   [[ $usepython3exec = "true" ]] && rfrtools_options+=("--use-python3-exe-too")
   [[ $updaterepo = "true" ]] && rfrtools_options+=("--update-aptget")
   [[ $installdependencies = "true" ]] && rfrtools_options+=("--install-deb-deps")
   [[ $install_pkg_rfrtools = "true" ]] && rfrtools_options+=("--install-python-package")
-
-  # create list of arguments for script_tools call
-  declare -ga scriptools_options=("$selectedbranch")
+  [[ $install_rfrtools_gui = "true" ]] && rfrtools_options+=("--install-gui")
 
   echo "Using \"$selectedbranch\" branch"
   echo "Options used for RFR_Tools script: \"${rfrtools_options[@]}\""
-  echo "Options used for script_tools script: \"${scriptools_options[@]}\""
 }
 
 #################################################
-## Cloning GoPiGo3, Script_Tools & RFR_Tools ####
+########## Cloning GoPiGo3 & RFR_Tools ##########
 #################################################
 
+# called in <<install_rfrtools_repo>>
+check_dependencies() {
+  command -v git >/dev/null 2>&1 || { echo "This script requires \"git\" but it's not installed. Error occurred with RFR_Tools installation." >&2; exit 1; }
+  command -v python >/dev/null 2>&1 || { echo "Executable \"python\" couldn't be found. Error occurred with RFR_Tools installation." >&2; exit 2; }
+  command -v pip >/dev/null 2>&1 || { echo "Executable \"pip\" couldn't be found. Error occurred with RFR_Tools installation." >&2; exit 3; }
+  if [[ $usepython3exec = "true" ]]; then
+    command -v python3 >/dev/null 2>&1 || { echo "Executable \"python3\" couldn't be found. Error occurred with RFR_Tools installation." >&2; exit 4; }
+    command -v pip3 >/dev/null 2>&1 || { echo "Executable \"pip3\" couldn't be found. Error occurred with RFR_Tools installation." >&2; exit 5; }
+  fi
+
+  if [[ ! -f $DEXTERSCRIPT/functions_library.sh ]]; then
+    echo "script_tools didn\'t get installed. Enable the installation of dependencies with RFR_Tools.'"
+    exit 8
+  fi
+}
+
 # called way down below
-install_scriptools_and_rfrtools() {
+install_rfrtools_repo() {
 
   # if rfrtools is not bypassed then install it
   if [[ $install_rfrtools = "true" ]]; then
@@ -164,19 +173,10 @@ install_scriptools_and_rfrtools() {
     echo "Done installing RFR_Tools"
   fi
 
-  # update script_tools
-  curl --silent -kL https://raw.githubusercontent.com/DexterInd/script_tools/$selectedbranch/install_script_tools.sh > $PIHOME/.tmp_script_tools.sh
-  echo "Installing script_tools. This might take a while.."
-  bash $PIHOME/.tmp_script_tools.sh $selectedbranch > /dev/null
-  ret_val=$?
-  rm $PIHOME/.tmp_script_tools.sh
-  if [[ $ret_val -ne 0 ]]; then
-    echo "script_tools failed installing with exit code $ret_val. Exiting."
-    exit 6
-  fi
-  # needs to be sourced from here when we call this as a standalone
+  # check if all deb packages have been installed with RFR_Tools
+  check_dependencies
+
   source $DEXTERSCRIPT/functions_library.sh
-  feedback "Done installing script_tools"
 }
 
 # called way down bellow
@@ -285,8 +285,10 @@ install_gopigp3_power_service() {
 ################################################
 
 check_if_run_with_pi
+
 parse_cmdline_arguments "$@"
-install_scriptools_and_rfrtools
+install_rfrtools_repo
+
 clone_gopigo3
 install_python_pkgs_and_dependencies
 install_gopigp3_power_service