From aacc8e0c29debb11d6ef20f83b1da543dcf5c1bb Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <markstedt@gmail.com>
Date: Thu, 25 Aug 2022 17:59:57 -0700
Subject: [PATCH] easyinstall: use pip3 consistently, create working dirs
 early, etc. (#801)

* Use the pip3 alias to work on older systems, such as Buster

* Put Reloaded into the main menu

* Make sure working dirs are created earlier in the process. Issue#803
---
 easyinstall.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/easyinstall.sh b/easyinstall.sh
index 4f27a6b3..458bc747 100755
--- a/easyinstall.sh
+++ b/easyinstall.sh
@@ -13,7 +13,7 @@ logo="""
  ~ (║|_____|║) ~\n
 ( : ║ .  __ ║ : )\n
  ~ .╚╦═════╦╝. ~\n
-  (  ¯¯¯¯¯¯¯  ) RaSCSI Assistant\n
+  (  ¯¯¯¯¯¯¯  ) RaSCSI Reloaded Assistant\n
    '~ .~~~. ~'\n
        '~'\n
 """
@@ -90,7 +90,7 @@ function cachePipPackages(){
     pushd $WEB_INSTALL_PATH
     # Refresh the sudo authentication, which shouldn't trigger another password prompt
     sudo -v
-    sudo pip install -r ./requirements.txt
+    sudo pip3 install -r ./requirements.txt
     popd
 }
 
@@ -1066,11 +1066,11 @@ function runChoice() {
               echo "- Install manpages to /usr/local/man"
               echo "- Create a self-signed certificate in /etc/ssl"
               sudoCheck
+              createImagesDir
+              createCfgDir
               configureTokenAuth
               stopOldWebInterface
               updateRaScsiGit
-              createImagesDir
-              createCfgDir
               installPackages
               stopRaScsiScreen
               stopRaScsi
@@ -1108,9 +1108,10 @@ function runChoice() {
               echo "- Install binaries to /usr/local/bin"
               echo "- Install manpages to /usr/local/man"
               sudoCheck
+              createImagesDir
+              createCfgDir
               configureTokenAuth
               updateRaScsiGit
-              createImagesDir
               installPackages
               stopRaScsiScreen
               stopRaScsi
@@ -1197,8 +1198,8 @@ function runChoice() {
               echo "- Install binaries to /usr/local/bin"
               echo "- Install manpages to /usr/local/man"
               sudoCheck
-              updateRaScsiGit
               createImagesDir
+              updateRaScsiGit
               installPackages
               stopRaScsi
               compileRaScsi
@@ -1216,8 +1217,8 @@ function runChoice() {
               echo "- Modify user groups and permissions"
               echo "- Create a self-signed certificate in /etc/ssl"
               sudoCheck
-              updateRaScsiGit
               createCfgDir
+              updateRaScsiGit
               installPackages
               preparePythonCommon
               cachePipPackages