Circuit-Forge/cf-node-bootstrap
6
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity Actions

fixed legacy urls in fallbacks, added better dry run handling of

Browse source 
dependencies
This commit is contained in:
pyr0ball 2023-06-15 02:30:19 -07:00
parent 198ea05975
commit 4d51caf316
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
extras/Slipstream.install
View file

@ -15,11 +15,11 @@ else
else else
# Iterate through get commands and fall back on next if unavailable # Iterate through get commands and fall back on next if unavailable
if command -v curl >/dev/null 2>&1; then if command -v curl >/dev/null 2>&1; then
source <(curl -ks 'https://raw.githubusercontent.com/pyr0ball/PRbL/master/functions') source <(curl -ks 'https://raw.githubusercontent.com/pyr0ball/PRbL/main/functions')
elif command -v wget >/dev/null 2>&1; then elif command -v wget >/dev/null 2>&1; then
source <(wget -qO- 'https://raw.githubusercontent.com/pyr0ball/PRbL/master/functions') source <(wget -qO- 'https://raw.githubusercontent.com/pyr0ball/PRbL/main/functions')
elif command -v fetch >/dev/null 2>&1; then elif command -v fetch >/dev/null 2>&1; then
source <(fetch -qo- 'https://raw.githubusercontent.com/pyr0ball/PRbL/master/functions') source <(fetch -qo- 'https://raw.githubusercontent.com/pyr0ball/PRbL/main/functions')
else else
echo "Error: curl, wget, and fetch commands are not available. Please install one to retrieve PRbL functions." echo "Error: curl, wget, and fetch commands are not available. Please install one to retrieve PRbL functions."
exit 1 exit 1
@ -98,7 +98,7 @@ check-deps(){
} }
install-deps(){ install-deps(){
logger echo "Installing packages $sys_packages" logger echo "Installing packages: $sys_packages"
for _package in ${sys_packages[@]} ; do for _package in ${sys_packages[@]} ; do
run install-packages $_package run install-packages $_package
done done
@ -106,21 +106,24 @@ install-deps(){
pip install -y ${rundir}/requirements.txt pip install -y ${rundir}/requirements.txt
else else
if [ ! -z $pip_packages ] ; then if [ ! -z $pip_packages ] ; then
pip install -y ${pip_packages[@]} pip install ${pip_packages[@]}
fi fi
fi fi
for _package in $prbl_packages ; do for _package in $prbl_packages ; do
if [ -f ${rundir}/$_package ] ; then if [ -f ${rundir}/$_package ] ; then
if [[ $dry_run != true ]] ; then if [[ $dry_run != true ]] ; then
bash "${rundir}/$_package -i" boxline "running extra $extra"
run "${rundir}/$_package -i"
else else
bash "${rundir}/$_package -D" dry_run=false
run "${rundir}/$_package -D"
dry_run=true
fi fi
else else
if [[ $dry_run != true ]] ; then if [[ $dry_run != true ]] ; then
run-from-url https://raw.githubusercontent.com/pyr0ball/PRbL-bashrc/master/extras/$_package -i run-from-url https://raw.githubusercontent.com/pyr0ball/PRbL-bashrc/main/extras/$_package -i
else else
run-from-url https://raw.githubusercontent.com/pyr0ball/PRbL-bashrc/master/extras/$_package -D run-from-url https://raw.githubusercontent.com/pyr0ball/PRbL-bashrc/main/extras/$_package -D
fi fi
fi fi
done done
@ -152,9 +155,9 @@ install(){
if ! check-deps ; then if ! check-deps ; then
warn "Some of the utilities needed by this install are missing" warn "Some of the utilities needed by this install are missing"
boxtop boxtop
logger echo -e "Missing utilities:" logger boxline "Missing utilities:"
for bin in ${bins_missing[@]} ; do for bin in ${bins_missing[@]} ; do
logger echo -e "${bins_missing[$bin]}" logger boxline "$bin"
done done
boxbottom boxbottom
boxborder "Would you like to install them? (this will require root password)" boxborder "Would you like to install them? (this will require root password)"