bump version to v2024.2 by default; fix bug

Dockerfile

@@ -3,15 +3,12 @@ FROM ubuntu:22.04
 RUN useradd -r -s /sbin/nologin -c "Microchip tools" -m libby
 USER root
 
-ENV LIBERO_VERSION="v2024.1"
+ENV LIBERO_VERSION="v2024.2"
 ENV SOFTCONSOLE_VERSION="v2022.2-RISC-V-747"
 ENV BASE_DIR="/opt/microchip"
 ARG DEBIAN_FRONTEND=noninteractive
 ENV XDG_RUNTIME_DIR="/tmp/.xdg/${UID}"
 
-ENV LIBERO_VERSION="v2024.1"
-ENV SOFTCONSOLE_VERSION="v2022.2-RISC-V-747"
-
 # install dirs
 ENV BASE_DIR="/opt/microchip"
 ENV INSTALLERS_DIR="${BASE_DIR}/installers"
@@ -37,6 +34,7 @@ RUN dpkg --add-architecture i386 && \
     apt-get upgrade -y && \
     apt-get install -y libxext6 libx11-6 libxrender1 libxtst6 libxi6 lsb default-jre build-essential
 
+ADD installers/* ${BASE_DIR}/installers/
 ADD scripts/* ${BASE_DIR}/scripts/
 # run installer in silent mode using config file
 RUN echo "Installing Libero... This could take a bit"

Makefile

@@ -9,7 +9,7 @@ C_GREEN=	\033[0;32m
 C_END=		\033[0m
 
 build:
-	podman build . -t libero --volume="${PWD}/installers:/opt/microchip/installers"
+	podman build . -t libero
 
 daemon: build
 	podman run -dt --replace --name libero \

installers/installer.cfg

@@ -7,7 +7,7 @@ USER_INPUT_RESULT_2=0
 USER_INPUT_RESULT_3=0
 
 #Choose Install Directory
-USER_INSTALL_DIR=/opt/microchip/Libero_SoC_v2024.1
+USER_INSTALL_DIR=/opt/microchip/Libero_SoC_v2024.2
 USER_COMMON_DIR=/opt/microchip/common
 
 #Choose Install Set

scripts/env

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # versions
-export LIBERO_VERSION="v2024.1"
+export LIBERO_VERSION="v2024.2"
 export SOFTCONSOLE_VERSION="v2022.2-RISC-V-747"
 
 # install dirs