From e2032db4e74c66d3f8bcba97497ccb5fff88df4b Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 11 Jul 2020 18:13:20 +0200 Subject: Adding linting for initcpio scripts archiso/initcpio/install/*: Setting bash shebang for all scripts and making them comform with shellcheck. archiso/initcpio/{hooks,script}/*: Setting ash shebang for all scripts and making them comform with shellcheck (for dash, as shellcheck has no ash specific ruleset). Essentially the ash based scripts should be POSIX compliant as much as possible to have an easier time writing, debugging and maintaining them. Ensuring that variables are not treated as options and introducing variable quoting. .gitlab-ci.yml: Integrating shellcheck for initcpio scripts. Closes #32 --- archiso/initcpio/hooks/archiso_loop_mnt | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'archiso/initcpio/hooks/archiso_loop_mnt') diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt index 2e99404..c32a544 100644 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ b/archiso/initcpio/hooks/archiso_loop_mnt @@ -1,10 +1,12 @@ -# vim: set ft=sh: +#!/bin/ash run_hook () { - [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}" - [[ -z "${img_flags}" ]] && img_flags="defaults" - if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then - mount_handler="archiso_loop_mount_handler" + # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + [ -n "${img_label}" ] && img_dev="/dev/disk/by-label/${img_label}" + [ -z "${img_flags}" ] && img_flags="defaults" + # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + if [ -n "${img_dev}" ] && [ -n "${img_loop}" ]; then + export mount_handler="archiso_loop_mount_handler" fi } @@ -15,21 +17,24 @@ archiso_loop_mount_handler () { msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" "${img_flags}" - if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${img_dev}) >> /run/archiso/used_block_devices + # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + if [ "${copytoram}" != "y" ]; then + readlink -f "${img_dev}" >> /run/archiso/used_block_devices fi if _dev_loop=$(losetup --find --show --read-only "/run/archiso/img_dev/${img_loop}"); then - archisodevice="${_dev_loop}" + export archisodevice="${_dev_loop}" else echo "ERROR: Setting loopback device for file '/run/archiso/img_dev/${img_loop}'" launch_interactive_shell fi - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" - if [[ "${copytoram}" == "y" ]]; then - losetup -d ${_dev_loop} 2>/dev/null + if [ "${copytoram}" = "y" ]; then + losetup -d "${_dev_loop}" 2>/dev/null umount /run/archiso/img_dev fi } + +# vim: set ft=sh: -- cgit v1.2.3-70-g09d2