Skip to content

Commit

Permalink
easyinstall: use pip3 consistently, create working dirs early, etc. (P…
Browse files Browse the repository at this point in the history
…iSCSI#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
  • Loading branch information
rdmark authored Aug 26, 2022
1 parent 4a870a1 commit aacc8e0
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions easyinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ logo="""
 ~ (║|_____|║) ~\n
( : ║ .  __ ║ : )\n
 ~ .╚╦═════╦╝. ~\n
  (  ¯¯¯¯¯¯¯  ) RaSCSI Assistant\n
  (  ¯¯¯¯¯¯¯  ) RaSCSI Reloaded Assistant\n
   '~ .~~~. ~'\n
       '~'\n
"""
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit aacc8e0

Please sign in to comment.