Skip to content

Commit

Permalink
sh-elf-vhex - v2.2.1-rc0 : fix Docker integration
Browse files Browse the repository at this point in the history
*fix*
> [scripts]
  | [gcc] fix `--noconfirm` handling when missing GCC prerequisites fails
  | [gcc] fix missing `bzip2` tool required by the GCC prerequisites checking step
  • Loading branch information
YannMagnin committed Jun 13, 2024
1 parent e65db0b commit 1f93a1c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
6 changes: 3 additions & 3 deletions scripts/binutils/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ then
pm='pkg'
pm_has='dpkg -s'
pm_install='ASSUME_ALWAYS_YES=yes pkg install'
elif command -v apt >/dev/null 2>&1
elif command -v apt-get >/dev/null 2>&1
then
deps='cmake libmpfr-dev libmpc-dev libgmp-dev libpng-dev libppl-dev'
deps="$deps flex g++ git texinfo xz-utils gcc"
pm='apt'
deps="$deps flex g++ git texinfo xz-utils gcc bzip2"
pm='apt-get'
pm_has='dpkg -s'
pm_install='sudo apt install -y'
elif command -v dnf >/dev/null 2>&1
Expand Down
19 changes: 11 additions & 8 deletions scripts/gcc/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ EOF
#---

cached='true'
noconfirm='false'
prefix_sysroot=
version=
verbose=
Expand All @@ -33,7 +34,7 @@ for arg
--no-cache) cached='true';;
--prefix-sysroot=*) prefix_sysroot=${arg#*=};;
--version=*) version=${arg#*=};;
--noconfirm) ;;
--noconfirm) noconfirm='true';;
*)
echo "error: unrecognized argument '$arg', giving up." >&2
exit 1
Expand Down Expand Up @@ -115,12 +116,14 @@ echo "$TAG install dependencies..."
cd ./archive || exit 1
if ! utils_warn_callcmd ./contrib/download_prerequisites
then
echo -en \
'The installation of GCC'\''s prerequisites has failed\n' \
'Do you want to continue the installation ? [yN]: '
read -r valid < /dev/tty
if [[ "$valid" != 'y' ]]; then
echo 'Operation aborted o(x_x)o'
exit 1
echo 'The installation of GCC'\''s prerequisites has failed'
if [[ "$noconfirm" == 'false' ]]
then
echo -en 'Do you want to continue the installation ? [yN]: '
read -r valid < /dev/tty
if [[ "$valid" != 'y' ]]; then
echo 'Operation aborted o(x_x)o'
exit 1
fi
fi
fi

0 comments on commit 1f93a1c

Please sign in to comment.