From d0b36bda5433a35dcd8ff1f089e781d7eb709813 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Thu, 15 Jun 2023 01:52:32 -0700 Subject: [PATCH] updated extras run function to handle dryruns better --- PRbL | 2 +- install.sh | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/PRbL b/PRbL index c03ad9e..7c13e1b 160000 --- a/PRbL +++ b/PRbL @@ -1 +1 @@ -Subproject commit c03ad9e03328fe3f915b5995fc754e64b17c515d +Subproject commit 7c13e1b9d3c00caf7a26a991150384955e78e540 diff --git a/install.sh b/install.sh index 3d5da69..110eb41 100755 --- a/install.sh +++ b/install.sh @@ -292,27 +292,33 @@ install-deps(){ } install-extras(){ - _extras=() - extra_installs=$(ls ${escape_dir}/extras/) - for file in $extra_installs ; do - _extras+=("$file") - done + _extras=($(ls ${escape_dir}/extras/)) + # extra_installs=$(ls ${escape_dir}/extras/) + # for file in $extra_installs ; do + # _extras+=("$file") + # done boxborder "Which extras should be installed?" - multiselect result _extras "false" + for each in {1..${#_extras[@]}} ; do + preselect+=("false") + done + multiselect result _extras preselect # For each extra, compare input choice and apply installs idx=0 for extra in "${_extras[@]}"; do # If the selected user is set to true if [[ "${result[idx]}" == "true" ]] ; then - # if [[ $dry_run != true ]] ; then + if [[ $dry_run != true ]] ; then + boxline "running extra $extra" run "${escape_dir}/extras/$extra -i" - # else - # dry_run=false - # run "${escape_dir}/extras/$extra -D" - # dry_run=true - # fi + else + dry_run=false + run "${escape_dir}/extras/$extra -D" + dry_run=true + fi + # else + # echo "index for $extra is ${result[idx]}" fi done }