Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-11-26 13:49:21 +00:00
Code Issues Projects Releases Wiki Activity

easyinstall: use pip3 consistently, create working dirs early, etc. (#801)

Browse Source 
* 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
This commit is contained in:
Daniel Markstedt 2022-08-25 17:59:57 -07:00 committed by GitHub
parent 4a870a137c
commit aacc8e0c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
easyinstall.sh
View File

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