whitespaces

This commit is contained in:
Bernhard Landauer 2018-04-19 23:24:19 +02:00
parent fdf797e2fb
commit 4134a2db17
9 changed files with 16 additions and 16 deletions

View file

@ -158,7 +158,7 @@ miso_mount_handler() {
fi fi
if [[ "${checksum}" == "y" ]]; then 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}.sfs" ]]; then
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then
msg -n ":: Self-test requested, please wait..." msg -n ":: Self-test requested, please wait..."
@ -178,7 +178,7 @@ miso_mount_handler() {
fi fi
if [[ "${verify}" == "y" ]]; then 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" ]]; then
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then
msg -n ":: Signature verification requested, please wait..." 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 dest_sfs="/run/miso/sfs" dest_img="/run/miso/img"
local lower_dir 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 if [[ -f "${src}/${sfs}.sfs" ]]; then
_mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}" _mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}"
if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then

View file

@ -40,7 +40,7 @@ miso_pxe_http_mount_handler () {
local _src=${miso_http_srv}${misobasedir}/${arch} 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 if [[ ! -z "$( curl -L -s --head "${_src}/${sfs}.sfs" | grep "OK" )" ]]; then
_curl_get "${_src}/${sfs}.sfs" "/${arch}" _curl_get "${_src}/${sfs}.sfs" "/${arch}"

View file

@ -225,7 +225,7 @@ gen_iso_fn(){
! [[ ${full_iso} ]] && vars+=("minimal") ! [[ ${full_iso} ]] && vars+=("minimal")
vars+=("${target_arch}") vars+=("${target_arch}")
for n in ${vars[@]};do for n in ${vars[@]}; do
name=${name:-}${name:+-}${n} name=${name:-}${name:+-}${n}
done done
echo $name echo $name

View file

@ -49,7 +49,7 @@ select_os(){
if [[ ${count} > 1 ]]; then if [[ ${count} > 1 ]]; then
msg "Detected systems:" msg "Detected systems:"
local i=0 local i=0
for os in ${os_list[@]};do for os in ${os_list[@]}; do
local last=${os##*:} local last=${os##*:}
case $last in case $last in
'efi') count=$((count-1)) ;; 'efi') count=$((count-1)) ;;

View file

@ -156,7 +156,7 @@ archive_logs(){
post_build(){ post_build(){
source PKGBUILD source PKGBUILD
local ext='pkg.tar.xz' tarch ver src local ext='pkg.tar.xz' tarch ver src
for pkg in ${pkgname[@]};do for pkg in ${pkgname[@]}; do
case $arch in case $arch in
any) tarch='any' ;; any) tarch='any' ;;
*) tarch=${target_arch} *) tarch=${target_arch}

View file

@ -37,7 +37,7 @@ clone_tree(){
sync_tree_manjaro(){ sync_tree_manjaro(){
cd ${tree_dir} cd ${tree_dir}
for repo in ${repo_tree[@]};do for repo in ${repo_tree[@]}; do
if [[ -d packages-${repo} ]]; then if [[ -d packages-${repo} ]]; then
cd packages-${repo} cd packages-${repo}
sync_tree "${repo}" sync_tree "${repo}"
@ -52,7 +52,7 @@ sync_tree_manjaro(){
sync_tree_abs(){ sync_tree_abs(){
local repo_tree_abs=('packages' 'community') local repo_tree_abs=('packages' 'community')
cd ${tree_dir_abs} cd ${tree_dir_abs}
for repo in ${repo_tree_abs[@]};do for repo in ${repo_tree_abs[@]}; do
if [[ -d ${repo} ]]; then if [[ -d ${repo} ]]; then
cd ${repo} cd ${repo}
sync_tree "${repo}" sync_tree "${repo}"

View file

@ -19,7 +19,7 @@ make_torrent(){
find ${src_dir} -type f -name "*.torrent" -delete find ${src_dir} -type f -name "*.torrent" -delete
if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then 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 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}) local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w ${seed})
${verbose} && mktorrent_args+=(-v) ${verbose} && mktorrent_args+=(-v)

View file

@ -74,7 +74,7 @@ write_services_conf(){
echo '---' > "$conf" echo '---' > "$conf"
echo '' >> "$conf" echo '' >> "$conf"
echo 'services:' > "$conf" echo 'services:' > "$conf"
for s in ${enable_systemd[@]};do for s in ${enable_systemd[@]}; do
echo " - name: $s" >> "$conf" echo " - name: $s" >> "$conf"
echo ' mandatory: false' >> "$conf" echo ' mandatory: false' >> "$conf"
echo '' >> "$conf" echo '' >> "$conf"
@ -84,7 +84,7 @@ write_services_conf(){
echo ' mandatory: true' >> "$conf" echo ' mandatory: true' >> "$conf"
echo '' >> "$conf" echo '' >> "$conf"
echo 'disable:' >> "$conf" echo 'disable:' >> "$conf"
for s in ${disable_systemd[@]};do for s in ${disable_systemd[@]}; do
echo " - name: $s" >> "$conf" echo " - name: $s" >> "$conf"
echo ' mandatory: false' >> "$conf" echo ' mandatory: false' >> "$conf"
echo '' >> "$conf" echo '' >> "$conf"
@ -134,7 +134,7 @@ write_users_conf(){
echo "---" > "$conf" echo "---" > "$conf"
echo "defaultGroups:" >> "$conf" echo "defaultGroups:" >> "$conf"
local IFS=',' local IFS=','
for g in ${addgroups[@]};do for g in ${addgroups[@]}; do
echo " - $g" >> "$conf" echo " - $g" >> "$conf"
done done
unset IFS unset IFS
@ -232,7 +232,7 @@ get_yaml(){
args+=("${profile}/packages") args+=("${profile}/packages")
fi fi
args+=("systemd") args+=("systemd")
for arg in ${args[@]};do for arg in ${args[@]}; do
yaml=${yaml:-}${yaml:+-}${arg} yaml=${yaml:-}${yaml:+-}${arg}
done done
echo "${yaml}.yaml" echo "${yaml}.yaml"
@ -395,7 +395,7 @@ write_netgroup_yaml(){
echo " hidden: false" >> "$2" echo " hidden: false" >> "$2"
echo " critical: false" >> "$2" echo " critical: false" >> "$2"
echo " packages:" >> "$2" echo " packages:" >> "$2"
for p in ${packages[@]};do for p in ${packages[@]}; do
echo " - $p" >> "$2" echo " - $p" >> "$2"
done done
${validate} && check_yaml "$2" ${validate} && check_yaml "$2"

View file

@ -729,7 +729,7 @@ is_valid_branch(){
run(){ run(){
if ${is_build_list}; then if ${is_build_list}; then
for item in ${build_list[@]};do for item in ${build_list[@]}; do
$1 $item $1 $item
done done
else else