Switch to pure bash yaml parsing

Author: erichlf

install.sh

@@ -13,17 +13,13 @@ case "$kernel" in
   ;;
 *"azure"*) # github action
   export CI=true
-  sudo apt-get update
-  sudo apt-get install -y yq
   if [[ $DEV_WORKSPACE != "" ]]; then
     base_install "devcontainer"
   else
     base_install "ubuntu"
   fi
   ;;
 *"generic"*)
-  sudo apt-get update
-  sudo apt-get install -y yq
   if [[ $DEV_WORKSPACE != "" ]]; then
     base_install "devcontainer"
   else
@@ -36,8 +32,6 @@ case "$kernel" in
   ;;
 *)
   if [[ $DEV_WORKSPACE != "" ]]; then
-    sudo apt-get update
-    sudo apt-get install -y yq
     base_install "devcontainer"
   else
     echo \

scripts/base_install.sh

@@ -23,10 +23,10 @@ function base_install() {
     name="${categories[$i]}"
     orig="${orig_keys[$i]}"
 
-    # materialize the dynamically-named array into pkgs[]
-    eval 'pkgs=( "${'"$name"'[@]}" )'
+    # pull the list items from YAML into pkgs[] (no eval, no mutation)
+    mapfile -t pkgs < <(collect_yaml_lists "$name" "$CONFIG_YAML")
 
-    [ ${#pkgs[@]} -eq 0 ] && continue
+    ((${#pkgs[@]})) || continue
 
     case "$orig" in
     base-ubuntu)
@@ -36,7 +36,7 @@ function base_install() {
       _do pac_install "${pkgs[@]}"
       ;;
     base-phone)
-      _do pkg_install "${pkg[@]}"
+      _do pkg_install "${pkgs[@]}"
       ;;
     esac
   done
@@ -54,10 +54,10 @@ function base_install() {
     name="${categories[$i]}"
     orig="${orig_keys[$i]}"
 
-    # materialize the dynamically-named array into pkgs[]
-    eval 'pkgs=( "${'"$name"'[@]}" )'
+    # pull the list items from YAML into pkgs[] (no eval, no mutation)
+    mapfile -t pkgs < <(collect_yaml_lists "$name" "$CONFIG_YAML")
 
-    [ ${#pkgs[@]} -eq 0 ] && continue
+    ((${#pkgs[@]})) || continue
 
     case "$orig" in
     pacstall)
@@ -103,10 +103,10 @@ function base_install() {
     name="${categories[$i]}"
     orig="${orig_keys[$i]}"
 
-    # materialize the dynamically-named array into pkgs[]
-    eval 'pkgs=( "${'"$name"'[@]}" )'
+    # pull the list items from YAML into pkgs[] (no eval, no mutation)
+    mapfile -t pkgs < <(collect_yaml_lists "$name" "$CONFIG_YAML")
 
-    [ ${#pkgs[@]} -eq 0 ] && continue
+    ((${#pkgs[@]})) || continue
 
     case "$orig" in
     final-ubuntu)
@@ -116,7 +116,7 @@ function base_install() {
       _do pac_install "${pkgs[@]}"
       ;;
     final-phone)
-      _do pkg_install "${pkg[@]}"
+      _do pkg_install "${pkgs[@]}"
       ;;
     final-extras)
       local x

scripts/read_yaml.sh

@@ -113,3 +113,4 @@ collect_yaml_lists() {
   fi
 }
 
+