From 4134a2db170e6822962eff994d9700d2f8d26e53 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Thu, 19 Apr 2018 23:24:19 +0200 Subject: [PATCH] whitespaces --- initcpio/hooks/miso | 6 +++--- initcpio/hooks/miso_pxe_http | 2 +- lib/util-iso.sh | 2 +- lib/util-mount.sh | 2 +- lib/util-pkg-chroot.sh | 2 +- lib/util-pkgtree.sh | 4 ++-- lib/util-publish.sh | 2 +- lib/util-yaml.sh | 10 +++++----- lib/util.sh | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/initcpio/hooks/miso b/initcpio/hooks/miso index 3c32645..2cf99a7 100644 --- a/initcpio/hooks/miso +++ b/initcpio/hooks/miso @@ -158,7 +158,7 @@ miso_mount_handler() { fi if [[ "${checksum}" == "y" ]]; then - for fs in rootfs desktopfs mhwdfs livefs;do + for fs in rootfs desktopfs mhwdfs livefs; do if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then msg -n ":: Self-test requested, please wait..." @@ -178,7 +178,7 @@ miso_mount_handler() { fi if [[ "${verify}" == "y" ]]; then - for fs in rootfs desktopfs mhwdfs livefs;do + for fs in rootfs desktopfs mhwdfs livefs; do if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then msg -n ":: Signature verification requested, please wait..." @@ -221,7 +221,7 @@ miso_mount_handler() { local dest_sfs="/run/miso/sfs" dest_img="/run/miso/img" local lower_dir - for sfs in livefs mhwdfs desktopfs rootfs;do + for sfs in livefs mhwdfs desktopfs rootfs; do if [[ -f "${src}/${sfs}.sfs" ]]; then _mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}" if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then diff --git a/initcpio/hooks/miso_pxe_http b/initcpio/hooks/miso_pxe_http index 124e1dc..80c2682 100644 --- a/initcpio/hooks/miso_pxe_http +++ b/initcpio/hooks/miso_pxe_http @@ -40,7 +40,7 @@ miso_pxe_http_mount_handler () { local _src=${miso_http_srv}${misobasedir}/${arch} - for sfs in livefs mhwdfs desktopfs rootfs;do + for sfs in livefs mhwdfs desktopfs rootfs; do if [[ ! -z "$( curl -L -s --head "${_src}/${sfs}.sfs" | grep "OK" )" ]]; then _curl_get "${_src}/${sfs}.sfs" "/${arch}" diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 88445f5..7ed4cf5 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -225,7 +225,7 @@ gen_iso_fn(){ ! [[ ${full_iso} ]] && vars+=("minimal") vars+=("${target_arch}") - for n in ${vars[@]};do + for n in ${vars[@]}; do name=${name:-}${name:+-}${n} done echo $name diff --git a/lib/util-mount.sh b/lib/util-mount.sh index 5dac52f..1897e4d 100644 --- a/lib/util-mount.sh +++ b/lib/util-mount.sh @@ -49,7 +49,7 @@ select_os(){ if [[ ${count} > 1 ]]; then msg "Detected systems:" local i=0 - for os in ${os_list[@]};do + for os in ${os_list[@]}; do local last=${os##*:} case $last in 'efi') count=$((count-1)) ;; diff --git a/lib/util-pkg-chroot.sh b/lib/util-pkg-chroot.sh index 3266f3c..3d2a345 100644 --- a/lib/util-pkg-chroot.sh +++ b/lib/util-pkg-chroot.sh @@ -156,7 +156,7 @@ archive_logs(){ post_build(){ source PKGBUILD local ext='pkg.tar.xz' tarch ver src - for pkg in ${pkgname[@]};do + for pkg in ${pkgname[@]}; do case $arch in any) tarch='any' ;; *) tarch=${target_arch} diff --git a/lib/util-pkgtree.sh b/lib/util-pkgtree.sh index 20e1041..b83c089 100644 --- a/lib/util-pkgtree.sh +++ b/lib/util-pkgtree.sh @@ -37,7 +37,7 @@ clone_tree(){ sync_tree_manjaro(){ cd ${tree_dir} - for repo in ${repo_tree[@]};do + for repo in ${repo_tree[@]}; do if [[ -d packages-${repo} ]]; then cd packages-${repo} sync_tree "${repo}" @@ -52,7 +52,7 @@ sync_tree_manjaro(){ sync_tree_abs(){ local repo_tree_abs=('packages' 'community') cd ${tree_dir_abs} - for repo in ${repo_tree_abs[@]};do + for repo in ${repo_tree_abs[@]}; do if [[ -d ${repo} ]]; then cd ${repo} sync_tree "${repo}" diff --git a/lib/util-publish.sh b/lib/util-publish.sh index 1698e81..149134c 100644 --- a/lib/util-publish.sh +++ b/lib/util-publish.sh @@ -19,7 +19,7 @@ make_torrent(){ find ${src_dir} -type f -name "*.torrent" -delete if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then - for iso in $(ls ${src_dir}/*.iso);do + for iso in $(ls ${src_dir}/*.iso); do local seed=https://${host}/projects/${project}/storage/${profile}/${dist_release}/${iso##*/} local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w ${seed}) ${verbose} && mktorrent_args+=(-v) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index 5405274..c6e5347 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -74,7 +74,7 @@ write_services_conf(){ echo '---' > "$conf" echo '' >> "$conf" echo 'services:' > "$conf" - for s in ${enable_systemd[@]};do + for s in ${enable_systemd[@]}; do echo " - name: $s" >> "$conf" echo ' mandatory: false' >> "$conf" echo '' >> "$conf" @@ -84,7 +84,7 @@ write_services_conf(){ echo ' mandatory: true' >> "$conf" echo '' >> "$conf" echo 'disable:' >> "$conf" - for s in ${disable_systemd[@]};do + for s in ${disable_systemd[@]}; do echo " - name: $s" >> "$conf" echo ' mandatory: false' >> "$conf" echo '' >> "$conf" @@ -134,7 +134,7 @@ write_users_conf(){ echo "---" > "$conf" echo "defaultGroups:" >> "$conf" local IFS=',' - for g in ${addgroups[@]};do + for g in ${addgroups[@]}; do echo " - $g" >> "$conf" done unset IFS @@ -232,7 +232,7 @@ get_yaml(){ args+=("${profile}/packages") fi args+=("systemd") - for arg in ${args[@]};do + for arg in ${args[@]}; do yaml=${yaml:-}${yaml:+-}${arg} done echo "${yaml}.yaml" @@ -395,7 +395,7 @@ write_netgroup_yaml(){ echo " hidden: false" >> "$2" echo " critical: false" >> "$2" echo " packages:" >> "$2" - for p in ${packages[@]};do + for p in ${packages[@]}; do echo " - $p" >> "$2" done ${validate} && check_yaml "$2" diff --git a/lib/util.sh b/lib/util.sh index 438d03a..43ec39d 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -729,7 +729,7 @@ is_valid_branch(){ run(){ if ${is_build_list}; then - for item in ${build_list[@]};do + for item in ${build_list[@]}; do $1 $item done else