Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 922c4f4

Browse files
SibrenVassejsamr
authored andcommitted
Fix indentation (#35)
1 parent 07ea441 commit 922c4f4

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

bootiso

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ typeset -Ar commandPackages=(
3636
['partprobe']='parted'
3737
['curl']='curl'
3838
['tar']='tar'
39-
['bc']='bc'
40-
['wimlib-imagex']='wimlib'
39+
['bc']='bc'
40+
['wimlib-imagex']='wimlib'
4141
)
4242
typeset shortOptions='bydJahlMftLp'
4343
typeset -ar supportedFS=('vfat' 'exfat' 'ntfs' 'ext2' 'ext3' 'ext4' 'f2fs')
@@ -104,7 +104,7 @@ typeset -A userFlags=(
104104
['no-mime-check']=''
105105
['no-usb-check']=''
106106
['no-size-check']=''
107-
['no-wimsplit']=''
107+
['no-wimsplit']=''
108108
)
109109
typeset -A userVars=(
110110
['iso-file']=''
@@ -204,12 +204,12 @@ OPTION FLAGS
204204
through USB bus. $(redify 'Use at your own risks.')
205205
--no-size-check $scriptName won't assert that the device size is larger
206206
than the image. $(redify 'Use at your own risks.')
207-
--no-wimsplit Prevent splitting sources/install.wim file in Windows ISOs.
207+
--no-wimsplit Prevent splitting sources/install.wim file in Windows ISOs.
208208
--local-bootloader Prevent download of remote bootloader and force local (SYSLINUX) during
209209
installation. Applicable to [install-mount-rsync] action.
210210
--remote-bootloader <version> Force download of remote bootloader at version <version>.
211-
Version must follow the pattern MAJOR.MINOR. Examples: 4.08, 6.04.
212-
Applicable to [install-mount-rsync] action.
211+
Version must follow the pattern MAJOR.MINOR. Examples: 4.08, 6.04.
212+
Applicable to [install-mount-rsync] action.
213213
-- POSIX end of options.
214214
215215
@@ -658,10 +658,10 @@ parseArguments() {
658658
enableUserFlag 'no-size-check'
659659
shift
660660
;;
661-
--no-wimsplit)
662-
enableUserFlag 'no-wimsplit'
663-
shift
664-
;;
661+
--no-wimsplit)
662+
enableUserFlag 'no-wimsplit'
663+
shift
664+
;;
665665
--)
666666
isEndOfOptions=true
667667
shift
@@ -995,25 +995,25 @@ copyWithRsync() {
995995
rsyncWithProgress() {
996996
typeset -i i=1
997997
typeset statusFile=$(createTempFile "bootiso-status")
998-
typeset wimFile="$isoMountPoint/sources/install.wim"
999-
typeset rsyncOptions=""
998+
typeset wimFile="$isoMountPoint/sources/install.wim"
999+
typeset rsyncOptions=""
10001000
temporaryAssets+=("$statusFile")
1001-
if [ -f "$wimFile" ]; then
1002-
if [ "$disableWimsplit" == 'false' ]; then
1003-
rsyncOptions="--exclude sources/install.wim"
1004-
echogood "Detected a Windows install.wim file, which will be handled by \`wimlib-imagex' utility."
1005-
else
1006-
echowarn "Detected a Windows install.wim file but wimsplit has been disabled with \`--no-wim-split' option."
1007-
fi
1008-
fi
1001+
if [ -f "$wimFile" ]; then
1002+
if [ "$disableWimsplit" == 'false' ]; then
1003+
rsyncOptions="--exclude sources/install.wim"
1004+
echogood "Detected a Windows install.wim file, which will be handled by \`wimlib-imagex' utility."
1005+
else
1006+
echowarn "Detected a Windows install.wim file but wimsplit has been disabled with \`--no-wim-split' option."
1007+
fi
1008+
fi
10091009
(
1010-
# shellcheck disable=SC2086
1010+
# shellcheck disable=SC2086
10111011
rsync -r -q -I --no-links --no-perms --no-owner --no-group $rsyncOptions "$isoMountPoint"/. "$usbMountPoint"
1012-
local status=$?
1013-
if [ -f "$wimFile" ] && [ "$disableWimsplit" == 'false' ]; then
1014-
echo
1015-
wimlib-imagex split "$wimFile" "$usbMountPoint/sources/install.swm" 1024 |& indentAll
1016-
fi
1012+
local status=$?
1013+
if [ -f "$wimFile" ] && [ "$disableWimsplit" == 'false' ]; then
1014+
echo
1015+
wimlib-imagex split "$wimFile" "$usbMountPoint/sources/install.swm" 1024 |& indentAll
1016+
fi
10171017
echo "$status" >"$statusFile"
10181018
) &
10191019
pid=$!
@@ -1396,7 +1396,7 @@ assignInternalVariables() {
13961396
disableMimeCheck=${userFlags['no-mime-check']:-'false'}
13971397
disableUSBCheck=${userFlags['no-usb-check']:-'false'}
13981398
disableSizeCheck=${userFlags['no-size-check']:-'false'}
1399-
disableWimsplit=${userFlags['no-wimsplit']:-'false'}
1399+
disableWimsplit=${userFlags['no-wimsplit']:-'false'}
14001400
# Vars flags
14011401
partitionType=${userVars['type']:-'vfat'}
14021402
selectedDevice=${userVars['device']:-''}

0 commit comments

Comments
 (0)