Skip to content

Commit 5f1d082

Browse files
committed
removed colors sourcing from all build scripts & making code look good
1 parent b4515c8 commit 5f1d082

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

build-impish-raw.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
# export variable SUITE to set debootstrap suite name (default: hirsute)
66

77
source plugins/envsetup
8-
source plugins/colors
98

109
export OVERRIDER_COMPRESSION_TYPE
1110
export SUITE
1211
export ENABLE_EXIT
1312
export ENABLE_USER_SETUP
1413

15-
frn="out/impish-raw"
16-
OVERRIDER_COMPRESSION_TYPE="gzip"
1714
SUITE="impish"
15+
frn="out/${SUITE}-raw"
16+
OVERRIDER_COMPRESSION_TYPE="gzip"
1817
ENABLE_EXIT=true
1918
ENABLE_USER_SETUP=false
2019

@@ -60,13 +59,17 @@ EOF
6059

6160
}
6261

63-
do_build "${frn}-arm64" arm64
64-
do_compress "${frn}-arm64"
65-
do_build "${frn}-armhf" armhf
66-
do_compress "${frn}-armhf"
67-
do_build "${frn}-amd64" amd64
68-
do_compress "${frn}-amd64"
62+
do_build "${frn}-arm64" arm64
63+
do_compress "${frn}-arm64"
64+
do_build "${frn}-armhf" armhf
65+
do_compress "${frn}-armhf"
66+
do_build "${frn}-amd64" amd64
67+
do_compress "${frn}-amd64"
68+
69+
do_unmount "${frn}-arm64"
70+
do_unmount "${frn}-armhf"
71+
do_unmount "${frn}-amd64"
72+
73+
shout "Build complete"
74+
ls ${frn}*tar*
6975

70-
do_unmount "${frn}-arm64"
71-
do_unmount "${frn}-armhf"
72-
do_unmount "${frn}-amd64"

cook.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
# export variable SUITE to set debootstrap suite name (default: hirsute)
66

77
source plugins/envsetup
8-
source plugins/colors
98

109
export OVERRIDER_COMPRESSION_TYPE
1110
export ENABLE_EXIT
1211
export ENABLE_USER_SETUP
13-
# export FS_USER
14-
# export FS_PASS
1512

1613
frn="out/hirsute-raw"
1714
OVERRIDER_COMPRESSION_TYPE="gzip"
@@ -59,13 +56,16 @@ deb $MIRROR $SUITE-backports main restricted universe multiverse
5956
EOF
6057
}
6158

62-
do_build "${frn}-arm64" arm64
63-
do_compress "${frn}-arm64"
64-
do_build "${frn}-armhf" armhf
65-
do_compress "${frn}-armhf"
66-
do_build "${frn}-amd64" amd64
67-
do_compress "${frn}-amd64"
59+
do_build "${frn}-arm64" arm64
60+
do_compress "${frn}-arm64"
61+
do_build "${frn}-armhf" armhf
62+
do_compress "${frn}-armhf"
63+
do_build "${frn}-amd64" amd64
64+
do_compress "${frn}-amd64"
6865

69-
do_unmount "${frn}-arm64"
70-
do_unmount "${frn}-armhf"
71-
do_unmount "${frn}-amd64"
66+
do_unmount "${frn}-arm64"
67+
do_unmount "${frn}-armhf"
68+
do_unmount "${frn}-amd64"
69+
70+
shout "Build Complete.."
71+
ls ${frn}*tar*

0 commit comments

Comments
 (0)