Skip to content

Commit 0f3e89f

Browse files
stevleibeltstevleibelt
committed
STYLE
1 parent 39825d4 commit 0f3e89f

File tree

1 file changed

+61
-56
lines changed

1 file changed

+61
-56
lines changed

‎build.sh‎

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -267,74 +267,75 @@ function add_packages_and_repository ()
267267
local PACKAGE_TO_REMOVE_ARRAY
268268
local PACKAGE_TO_ADD_ARRAY
269269

270-
_echo_if_be_verbose " Creating archzfs mirrorlist file >>${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}<<."
270+
_echo_if_be_verbose " Creating archzfs mirrorlist file >>${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}<<."
271271

272-
#bo: adding repository
273-
echo "Server = http://archzfs.com/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
274-
echo "Server = http://mirror.sum7.eu/archlinux/archzfs/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
275-
echo "Server = https://mirror.biocrafting.net/archlinux/archzfs/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
272+
#bo: adding repository
273+
echo "Server = http://archzfs.com/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
274+
echo "Server = http://mirror.sum7.eu/archlinux/archzfs/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
275+
echo "Server = https://mirror.biocrafting.net/archlinux/archzfs/\$repo/\$arch" >> "${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}"
276276

277-
_echo_if_be_verbose " Adding archzfs repositories to PATH_TO_THE_PACMAN_CONF_FILE >>${PATH_TO_THE_PACMAN_CONF_FILE}<<."
277+
_echo_if_be_verbose " Adding archzfs repositories to PATH_TO_THE_PACMAN_CONF_FILE >>${PATH_TO_THE_PACMAN_CONF_FILE}<<."
278278

279-
echo "" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
280-
echo "[archzfs]" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
281-
echo "Include = ${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
282-
#eo: adding repository
279+
echo "" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
280+
echo "[archzfs]" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
281+
echo "Include = ${PATH_TO_THE_PACMAN_D_ARCHZFS_FILE}" >> ${PATH_TO_THE_PACMAN_CONF_FILE}
282+
#eo: adding repository
283283

284-
#bo: removing package
285-
IFS=',' read -r -a PACKAGE_TO_REMOVE_ARRAY <<< "${PACKAGES_TO_REMOVE}"
284+
#bo: removing package
285+
IFS=',' read -r -a PACKAGE_TO_REMOVE_ARRAY <<< "${PACKAGES_TO_REMOVE}"
286286

287-
for PACKAGE_NAME in "${PACKAGE_TO_REMOVE_ARRAY[@]}";
288-
do
289-
_echo_if_be_verbose " Removing package >>${PACKAGE_NAME}<<."
290-
sed -i "/${PACKAGE_NAME}/d" "${PATH_TO_THE_PACKAGES_FILE}"
291-
done;
292-
#eo: removing package
287+
for PACKAGE_NAME in "${PACKAGE_TO_REMOVE_ARRAY[@]}";
288+
do
289+
_echo_if_be_verbose " Removing package >>${PACKAGE_NAME}<<."
290+
sed -i "/${PACKAGE_NAME}/d" "${PATH_TO_THE_PACKAGES_FILE}"
291+
done;
292+
#eo: removing package
293293

294-
#bo: adding package
295-
_echo_if_be_verbose " Adding packages."
294+
#bo: adding package
295+
_echo_if_be_verbose " Adding packages."
296296

297-
IFS=',' read -r -a PACKAGE_TO_ADD_ARRAY <<< "${PACKAGES_TO_ADD}"
297+
IFS=',' read -r -a PACKAGE_TO_ADD_ARRAY <<< "${PACKAGES_TO_ADD}"
298298

299-
for PACKAGE_NAME in "${PACKAGE_TO_ADD_ARRAY[@]}";
300-
do
301-
_echo_if_be_verbose " Adding package >>${PACKAGE_NAME}<<."
302-
echo "${PACKAGE_NAME}" >> "${PATH_TO_THE_PACKAGES_FILE}"
303-
done
299+
for PACKAGE_NAME in "${PACKAGE_TO_ADD_ARRAY[@]}";
300+
do
301+
_echo_if_be_verbose " Adding package >>${PACKAGE_NAME}<<."
302+
echo "${PACKAGE_NAME}" >> "${PATH_TO_THE_PACKAGES_FILE}"
303+
done
304304

305-
if [[ ${USE_DKMS} -eq 1 ]];
305+
if [[ ${USE_DKMS} -eq 1 ]];
306+
then
307+
if [[ ${KERNEL} != 'linux' ]];
306308
then
307-
if [[ ${KERNEL} != 'linux' ]];
308-
then
309-
sed -i -e "s/^linux$/${KERNEL}/" "${PATH_TO_THE_PACKAGES_FILE}"
310-
fi
311-
_echo_if_be_verbose " Adding package >>${KERNEL}-headers<<."
312-
echo "${KERNEL}-headers" >> "${PATH_TO_THE_PACKAGES_FILE}"
313-
314-
if [[ ${USE_GIT_PACKAGE} -eq 0 ]];
315-
then
316-
_echo_if_be_verbose " Adding package >>zfs-dkms<<."
317-
echo "zfs-dkms" >> "${PATH_TO_THE_PACKAGES_FILE}"
318-
else
319-
_echo_if_be_verbose " Adding package >>zfs-dkms-git<<."
320-
echo "zfs-dkms-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
321-
fi
309+
sed -i -e "s/^linux$/${KERNEL}/" "${PATH_TO_THE_PACKAGES_FILE}"
310+
fi
311+
_echo_if_be_verbose " Adding package >>${KERNEL}-headers<<."
312+
echo "${KERNEL}-headers" >> "${PATH_TO_THE_PACKAGES_FILE}"
313+
314+
if [[ ${USE_GIT_PACKAGE} -eq 0 ]];
315+
then
316+
_echo_if_be_verbose " Adding package >>zfs-dkms<<."
317+
echo "zfs-dkms" >> "${PATH_TO_THE_PACKAGES_FILE}"
322318
else
323-
if [[ ${USE_GIT_PACKAGE} -eq 0 ]];
324-
then
325-
_echo_if_be_verbose " Adding package >>zfs-${KERNEL}<<."
326-
echo "zfs-${KERNEL}" >> "${PATH_TO_THE_PACKAGES_FILE}"
327-
_echo_if_be_verbose " Adding package >>zfs-utils<<."
328-
echo "zfs-utils" >> "${PATH_TO_THE_PACKAGES_FILE}"
329-
else
330-
_echo_if_be_verbose " Adding package >>zfs-${KERNEL}-git<<."
331-
echo "zfs-${KERNEL}-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
332-
_echo_if_be_verbose " Adding package >>zfs-utils-git<<."
333-
echo "zfs-utils-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
334-
fi
319+
_echo_if_be_verbose " Adding package >>zfs-dkms-git<<."
320+
echo "zfs-dkms-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
335321
fi
336-
#eo: adding package
337-
echo ":: Finished adding packages and repository"
322+
else
323+
if [[ ${USE_GIT_PACKAGE} -eq 0 ]];
324+
then
325+
_echo_if_be_verbose " Adding package >>zfs-${KERNEL}<<."
326+
# zfs-linux or zfs-linux-lts
327+
echo "zfs-${KERNEL}" >> "${PATH_TO_THE_PACKAGES_FILE}"
328+
_echo_if_be_verbose " Adding package >>zfs-utils<<."
329+
echo "zfs-utils" >> "${PATH_TO_THE_PACKAGES_FILE}"
330+
else
331+
_echo_if_be_verbose " Adding package >>zfs-${KERNEL}-git<<."
332+
echo "zfs-${KERNEL}-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
333+
_echo_if_be_verbose " Adding package >>zfs-utils-git<<."
334+
echo "zfs-utils-git" >> "${PATH_TO_THE_PACKAGES_FILE}"
335+
fi
336+
fi
337+
#eo: adding package
338+
echo ":: Finished adding packages and repository"
338339
fi
339340
}
340341

@@ -435,6 +436,10 @@ function build_archiso ()
435436
#begin of building
436437
if [[ ${IS_DRY_RUN} -ne 1 ]];
437438
then
439+
# -o: set the output directory
440+
# -r: delete the working directory at the end
441+
# -v: enable verbose output
442+
# -w: set the working directory
438443
if [[ ${BE_VERBOSE} -gt 0 ]];
439444
then
440445
mkarchiso -v -w ${PATH_TO_THE_WORK_DIRECTORY} -o ${PATH_TO_THE_OUTPUT_DIRECTORY} ${PATH_TO_THE_PROFILE_DIRECTORY}

0 commit comments

Comments
 (0)