particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(justfiles): Add requested changes

Browse source
This commit is contained in:
lorduskordus 2024-06-26 11:04:44 +02:00
parent 499f8d2ddb
commit 6c5b04188c
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/justfiles/README.md
View file

@ -2,6 +2,8 @@
The `justfiles` module allows for easy `.just` files importing. It can be useful for example to separate DE specific justfiles when building multiple images.
:::note The module is compatible only with Universal Blue images. :::
## What it does
1. The module checks if the `config/justfiles/` folder is present.
@ -24,7 +26,7 @@ The `justfiles` module allows for easy `.just` files importing. It can be useful
* The module does not overwrite the destination file. New lines are added to an existing file.
* If the generated import lines are already present, the module fails to avoid duplications.
* If the generated import lines are already present, the module skips them to avoid duplications.
## How to use it

24
modules/justfiles/justfiles.sh
View file

@ -22,9 +22,9 @@ fi
for SELECTED in "${CONFIG_SELECTION[@]}"; do
echo "----------------------------------------------------------"
echo "------------ Adding folder/file '${SELECTED}' ------------"
echo "----------------------------------------------------------"
echo "------------------------------------------------------------------------"
echo "--- Adding folder/file '${SELECTED}'"
echo "------------------------------------------------------------------------"
# Find all justfiles, starting from 'SELECTED' and get their paths
JUSTFILES=($(find "${CONFIG_FOLDER}/${SELECTED}" -type f -name "*.just" | sed "s|${CONFIG_FOLDER}/||g"))
@ -38,11 +38,11 @@ for SELECTED in "${CONFIG_SELECTION[@]}"; do
# Validate all found justfiles if set to do so
if [ "${VALIDATE}" == "true" ]; then
echo "-- Validating justfiles"
echo "Validating justfiles"
VALIDATION_FAILED=0
for JUSTFILE in "${JUSTFILES[@]}"; do
if ! /usr/bin/just --fmt --check --unstable --justfile "${CONFIG_FOLDER}/${JUSTFILE}" &> /dev/null; then
echo "The justfile '${JUSTFILE}' FAILED validation."
echo "- The justfile '${JUSTFILE}' FAILED validation."
VALIDATION_FAILED=1
fi
done
@ -52,19 +52,19 @@ for SELECTED in "${CONFIG_SELECTION[@]}"; do
echo "Error: Some justfiles didn't pass validation."
exit 1
else
echo "All justfiles passed validation."
echo "- All justfiles passed validation."
fi
fi
# Copy 'SELECTED' to destination folder
echo "-- Copying folders/files"
echo "Copying folders/files"
mkdir -p "${DEST_FOLDER}/$(dirname ${SELECTED})"
cp -rfT "${CONFIG_FOLDER}/${SELECTED}" "${DEST_FOLDER}/${SELECTED}"
echo "Copied '${CONFIG_FOLDER}/${SELECTED}' to '${DEST_FOLDER}/${SELECTED}'."
echo "- Copied '${CONFIG_FOLDER}/${SELECTED}' to '${DEST_FOLDER}/${SELECTED}'."
# Generate import lines for all found justfiles
echo "-- Adding import lines"
echo "Adding import lines"
for JUSTFILE in "${JUSTFILES[@]}"; do
# Create an import line
@ -72,10 +72,10 @@ for SELECTED in "${CONFIG_SELECTION[@]}"; do
# Abort if import line already exists, else append it to import file
if grep -wq "${IMPORT_LINE}" "${IMPORT_FILE}"; then
echo "Error: Duplicated import line: '${IMPORT_LINE}' found."
exit 1
echo "- Skipped: '${IMPORT_LINE}' (already present)"
else
echo "${IMPORT_LINE}" | tee -a "${IMPORT_FILE}"
echo "${IMPORT_LINE}" >> "${IMPORT_FILE}"
echo "- Added: '${IMPORT_LINE}'"
fi
done