buildiso,check-yaml: prepare to validate yaml files against schemas

lib/util-iso-calamares.sh

@@ -29,10 +29,24 @@ write_finished_conf(){
     echo "restartNowCommand: \"${cmd}\"" >> "$conf"
 }
 
+get_preset(){
+    local p=${tmp_dir}/${kernel}.preset kvmaj kvmin digit
+    cp ${DATADIR}/linux.preset $p
+    digit=${kernel##linux}
+    kvmaj=${digit:0:1}
+    kvmin=${digit:1}
+
+    sed -e "s|@kvmaj@|$kvmaj|g" \
+        -e "s|@kvmin@|$kvmin|g" \
+        -e "s|@arch@|${target_arch}|g"\
+        -i $p
+    echo $p
+}
+
 write_bootloader_conf(){
     local conf="${modules_dir}/bootloader.conf"
     msg2 "Writing %s ..." "${conf##*/}"
-    source "$1"
+    source "$(get_preset)"
     echo '---' > "$conf"
     echo "efiBootLoader: \"${efi_boot_loader}\"" >> "$conf"
     echo "kernel: \"${ALL_kver#*/boot}\"" >> "$conf"
@@ -349,7 +363,7 @@ configure_calamares(){
         write_packages_conf
     fi
 
-    write_bootloader_conf "$2"
+    write_bootloader_conf
 
     write_mhwdcfg_conf
 

lib/util-iso-image.sh

@@ -241,7 +241,7 @@ configure_live_image(){
     configure_mhwd "$1"
     configure_system "$1"
     configure_services "$1"
-    configure_calamares "$1" "$1/etc/mkinitcpio.d/${kernel}.preset"
+    configure_calamares "$1"
     write_live_session_conf "$1"
     msg "Done configuring [live-image]"
 }

lib/util-iso-yaml.sh

@@ -12,32 +12,16 @@
 import ${LIBDIR}/util-iso.sh
 import ${LIBDIR}/util-iso-calamares.sh
 
-# check_yaml(){
+check_yaml(){
-# 	result=$(python -c 'import yaml,sys;yaml.safe_load(sys.stdin)' < $1)
+	msg2 "Checking validity [%s] ..." "${1##*/}"
-# 	msg2 "Checking validity [%s] ..." "${1##*/}"
+# 	pykwalify -c data -s schema
-# 	[[ $? -ne 0 ]] && error "yaml error: %s [msg: %s]"  "$1" "${result}"
-# }
-
-get_preset(){
-    local p=${tmp_dir}/${kernel}.preset kvmaj kvmin digit
-    cp ${DATADIR}/linux.preset $p
-    digit=${kernel##linux}
-    kvmaj=${digit:0:1}
-    kvmin=${digit:1}
-
-    sed -e "s|@kvmaj@|$kvmaj|g" \
-        -e "s|@kvmin@|$kvmin|g" \
-        -e "s|@arch@|${target_arch}|g"\
-        -i $p
-
-    echo $p
 }
 
 write_calamares_yaml(){
-    configure_calamares "${yaml_dir}" "$(get_preset)"
+    configure_calamares "${yaml_dir}"
-# 	for conf in "${yaml_dir}"/etc/calamares/modules/*.conf "${yaml_dir}"/etc/calamares/settings.conf; do
+	for conf in "${yaml_dir}"/etc/calamares/modules/*.conf "${yaml_dir}"/etc/calamares/settings.conf; do
-# 		check_yaml "$conf"
+		check_yaml "$conf"
-# 	done
+	done
 }
 
 write_netgroup_yaml(){
@@ -50,13 +34,14 @@ write_netgroup_yaml(){
     for p in ${packages[@]};do
         echo "       - $p" >> "$2"
     done
-# 	check_yaml "$2"
+	check_yaml "$2"
 }
 
 write_pacman_group_yaml(){
     packages=$(pacman -Sgq "$1")
     prepare_dir "${cache_dir_netinstall}/pacman"
     write_netgroup_yaml "$1" "${cache_dir_netinstall}/pacman/$1.yaml"
+    check_yaml "${cache_dir_netinstall}/pacman/$1.yaml"
     user_own "${cache_dir_netinstall}/pacman" "-R"
 }