@@ -6,6 +6,8 @@ export INCLUDE_PACKAGES
66export NO_COMPRESSION
77export SUITE
88
9+ export packages_buffer
10+
911BUILDNAME=" mate"
1012ROOT_DIR=" $( git rev-parse --show-toplevel) "
1113BUILD_CONFIG_DIR=" $ROOT_DIR /core/default"
@@ -16,7 +18,7 @@ OUT_DIR="${ROOT_DIR}/out/${BUILDNAME}"
1618BUILD_ARCH=" aarch64 armhf amd64"
1719PLUGIN_DIR=" ${ROOT_DIR} /plugins"
1820INCLUDE_PACKAGES=" $( cat " $INCLUDE_LIST " ) "
19- SUITE=" hirsute"
21+ SUITE=" hirsute" # (recomended: hirsute)
2022ADDITIONAL_CONF=false
2123# shellcheck disable=SC2034
2224ENABLE_EXIT=true
@@ -28,6 +30,20 @@ source "$PLUGIN_DIR/envsetup"
2830# shellcheck disable=SC1091
2931source " $PLUGIN_DIR /colors"
3032
33+ function run_cmd() {
34+ local cmd=" $* "
35+ do_chroot_ae " ${OUT_DIR} -${_arch} " /bin/bash -c " $cmd "
36+ }
37+
38+ function itterate_var() {
39+ local var=" $1 "
40+ export count=" 0"
41+
42+ for element in $var ; do
43+ (( count++ ))
44+ done
45+ }
46+
3147function stage_one() {
3248 export BUILD_DIR
3349
@@ -54,18 +70,32 @@ deb http://ports.ubuntu.com/ubuntu-ports ${SUITE} universe\n" >> "${OUT_DIR}-${_
5470 echo -e " ${GREEN} Stage 2: Running extra config script${NC} "
5571 $SUDO cp " $EXTRA_CONFIG_SCRIPT " " ${OUT_DIR} -${_arch} /root"
5672 $SUDO cp " $EXTRA_INCLUDE_LIST " " ${OUT_DIR} -${_arch} /root"
57- do_chroot_ae " ${OUT_DIR} -${_arch} " /bin/bash -c " /root/extra-config.sh"
73+ run_cmd " /root/extra-config.sh"
74+ run_cmd " rm -rf /root/extra-config.sh"
75+ run_cmd " rm -rf /root/include-i.list"
5876 else
5977 lwarn " No extra config script found"
6078 fi
6179
6280 if $ADDITIONAL_CONF ; then
6381 $SUDO cp " ${ROOT_DIR} /core/default/mate/layout.tar.xz" " ${OUT_DIR} -${_arch} /root"
64- do_chroot_ae " ${OUT_DIR} -${_arch} " /bin/bash -c " cd /root && tar xf layout.tar.xz"
82+ run_cmd " cd /root && tar xf layout.tar.xz"
83+ run_cmd " rm -rf /root/layout.tar.xz"
6584 fi
6685
86+ # * some more cleanup
87+ run_cmd " apt clean"
88+
6789 echo -e " ${GREEN} Stage 3: Building packages${NC} "
6890 do_compress " ${OUT_DIR} -${_arch} "
91+ packages_buffer+=" \n${OUT_DIR} -${_arch} "
6992}
7093
71- stage_one
94+ stage_one
95+
96+ # Final Echo
97+ itterate_var " $packages_buffer "
98+ echo -e " ${GREEN} Packages built: ${count}${NC} "
99+ echo -e " ${packages_buffer} "
100+
101+ exit 0
0 commit comments