Skip to content

Commit 2c784f4

Browse files
fix run_cmd() in envsetup & fix build scripts
1 parent 4aa30ed commit 2c784f4

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

.github/scripts/build-hirsute.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ export OVERRIDER_COMPRESSION_TYPE
66
export ENABLE_EXIT
77
export ENABLE_USER_SETUP
88

9-
SUITE="impish"
9+
SUITE="hirsute"
1010
frn="out/$SUITE-raw"
1111
OVERRIDER_COMPRESSION_TYPE="gzip"
1212
ENABLE_EXIT=true
1313
ENABLE_USER_SETUP=false
1414
PREFIX="${frn}"
1515

1616
additional_setup() {
17-
run_cmd echo deb $MIRROR $SUITE main restricted \> /etc/apt/sources.list
18-
run_cmd echo deb-src $MIRROR $SUITE main restricted \> /etc/apt/sources.list
19-
run_cmd echo deb $MIRROR $SUITE-updates multiverse \> /etc/apt/sources.list
20-
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser \> /etc/apt/sources.list
17+
run_cmd echo deb $MIRROR $SUITE main restricted > /etc/apt/sources.list
18+
run_cmd echo deb-src $MIRROR $SUITE main restricted > /etc/apt/sources.list
19+
run_cmd echo deb $MIRROR $SUITE-updates multiverse > /etc/apt/sources.list
20+
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser > /etc/apt/sources.list
2121
}
2222

2323
do_build "$PREFIX-arm64" arm64

.github/scripts/build-impish.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ export OVERRIDER_COMPRESSION_TYPE
66
export ENABLE_EXIT
77
export ENABLE_USER_SETUP
88

9-
SUITE="hirsute"
9+
SUITE="impish"
1010
frn="out/$SUITE-raw"
1111
OVERRIDER_COMPRESSION_TYPE="gzip"
1212
ENABLE_EXIT=true
1313
ENABLE_USER_SETUP=false
1414
PREFIX="${frn}"
1515

1616
additional_setup() {
17-
run_cmd echo deb $MIRROR $SUITE main restricted \> /etc/apt/sources.list
18-
run_cmd echo deb-src $MIRROR $SUITE main restricted \> /etc/apt/sources.list
19-
run_cmd echo deb $MIRROR $SUITE-updates multiverse \> /etc/apt/sources.list
20-
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser \> /etc/apt/sources.list
17+
run_cmd echo deb $MIRROR $SUITE main restricted > /etc/apt/sources.list
18+
run_cmd echo deb-src $MIRROR $SUITE main restricted > /etc/apt/sources.list
19+
run_cmd echo deb $MIRROR $SUITE-updates multiverse > /etc/apt/sources.list
20+
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser > /etc/apt/sources.list
2121
}
2222

2323
do_build "$PREFIX-arm64" arm64

plugins/envsetup

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,6 @@ do_tar_bzip() {
438438
}
439439

440440
run_cmd() {
441-
local chroot_dir=$1
442-
shift
443-
local command=$*
444441
do_mount "$chroot_dir"
445442
if [ -d "$chroot_dir" ]; then
446443
cat <<- EOF | $SUDO chroot "$chroot_dir"

0 commit comments

Comments
 (0)