Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-10 02:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Headless bypass for sudo -v in easyinstall (#963)

Browse Source 
* Headless bypass for sudo check. Also, correct check for mac drivers dir.

* Remove inline sudo -v checks. There's no proof they improve anything.

* Use akuker's dropbox storage
This commit is contained in:
Daniel Markstedt 2022-11-03 20:58:31 -07:00 committed by GitHub
parent 83d1595a35
commit 921ba7d2ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
easyinstall.sh
View File

@ -78,6 +78,10 @@ function initialChecks() {
# checks that the current user has sudoers privileges # checks that the current user has sudoers privileges
function sudoCheck() { function sudoCheck() {
if [[ $HEADLESS ]]; then
echo "Skipping password check in headless mode"
return 0
fi
echo "Input your password to allow this script to make the above changes." echo "Input your password to allow this script to make the above changes."
sudo -v sudo -v
} }
@ -128,8 +132,6 @@ function installPackagesStandalone() {
# cache the pip packages # cache the pip packages
function cachePipPackages(){ function cachePipPackages(){
pushd $WEB_INSTALL_PATH pushd $WEB_INSTALL_PATH
# Refresh the sudo authentication, which shouldn't trigger another password prompt
sudo -v
sudo pip3 install -r ./requirements.txt sudo pip3 install -r ./requirements.txt
popd popd
} }
@ -141,8 +143,6 @@ function compileRaScsi() {
echo "Compiling with ${CORES:-1} simultaneous cores..." echo "Compiling with ${CORES:-1} simultaneous cores..."
make clean </dev/null make clean </dev/null
# Refresh the sudo authentication, which shouldn't trigger another password prompt
sudo -v
make -j "${CORES:-1}" all CONNECT_TYPE="${CONNECT_TYPE:-FULLSPEC}" </dev/null make -j "${CORES:-1}" all CONNECT_TYPE="${CONNECT_TYPE:-FULLSPEC}" </dev/null
} }
@ -614,9 +614,9 @@ function installHfdisk() {
# Fetch HFS drivers that the Web Interface uses # Fetch HFS drivers that the Web Interface uses
function fetchHardDiskDrivers() { function fetchHardDiskDrivers() {
if [ ! -f "$BASE/mac-hard-disk-drivers" ]; then if [ ! -d "$BASE/mac-hard-disk-drivers" ]; then
cd "$BASE" || exit 1 cd "$BASE" || exit 1
wget https://macintoshgarden.org/sites/macintoshgarden.org/files/apps/mac-hard-disk-drivers.zip wget -r https://www.dropbox.com/s/gcs4v5pcmk7rxtb/mac-hard-disk-drivers.zip?dl=0
unzip -d mac-hard-disk-drivers mac-hard-disk-drivers.zip unzip -d mac-hard-disk-drivers mac-hard-disk-drivers.zip
rm mac-hard-disk-drivers.zip rm mac-hard-disk-drivers.zip
fi fi