Fix remaining issue

Author: Growl1234

toolchain/scripts/stage4/install_cereal.sh

@@ -50,7 +50,7 @@ case "$with_cereal" in
         # url construction rules:
         # - Branch names (master, main, develop) without v prefix
         # - Version tags (e.g., 1.0.0) with v prefix
-        if [[ "${cereal_ver}" =~ ^[0-9a-f]{7}$ ]]; then
+        if [[ "${cereal_ver}" =~ ^([0-9a-f]{7}|[0-9a-f]{40})$ ]]; then
             url="https://codeload.github.com/USCiLab/cereal/tar.gz/${cereal_ver}"
         else
             url="https://codeload.github.com/USCiLab/cereal/tar.gz/v${cereal_ver}"

toolchain/scripts/stage4/install_libcomm.sh

@@ -54,7 +54,7 @@ case "$with_libcomm" in
         # url construction rules:
         # - Branch names (master, main, develop) without v prefix
         # - Version tags (e.g., 1.0.0) with v prefix
-        if [[ "${libcomm_ver}" =~ ^[0-9a-f]{7}$ ]]; then
+        if [[ "${libcomm_ver}" =~ ^([0-9a-f]{7}|[0-9a-f]{40})$ ]]; then
             url="https://codeload.github.com/abacusmodeling/LibComm/tar.gz/${libcomm_ver}"
         else
             url="https://codeload.github.com/abacusmodeling/LibComm/tar.gz/v${libcomm_ver}"

toolchain/scripts/stage4/install_libri.sh

@@ -45,19 +45,19 @@ cd "${BUILDDIR}"
 case "$with_libri" in
     __INSTALL__)
         echo "==================== Installing LIBRI ===================="
-        dirname="LibRI-${short_ver}"
+        dirname="LibRI-${libri_ver}"
         pkg_install_dir="${INSTALLDIR}/$dirname"
         #pkg_install_dir="${HOME}/lib/libri/${libri_ver}"
         install_lock_file="${pkg_install_dir}/install_successful"
         # url construction rules:
         # - Branch names (master, main, develop) without v prefix
         # - Version tags (e.g., 1.0.0) with v prefix
-        if [[ "${libri_ver}" =~ ^[0-9a-f]{7}$ ]]; then
+        if [[ "${libri_ver}" =~ ^([0-9a-f]{7}|[0-9a-f]{40})$ ]]; then
             url="https://codeload.github.com/abacusmodeling/LibRI/tar.gz/${libri_ver}"
         else
             url="https://codeload.github.com/abacusmodeling/LibRI/tar.gz/v${libri_ver}"
         fi
-        filename="LibRI-${short_ver}.tar.gz"
+        filename="LibRI-${libri_ver}.tar.gz"
         if verify_checksums "${install_lock_file}"; then
             echo "$dirname is already installed, skipping it."
         else

toolchain/scripts/stage4/install_rapidjson.sh

@@ -44,19 +44,19 @@ cd "${BUILDDIR}"
 case "$with_rapidjson" in
     __INSTALL__)
         echo "==================== Installing RapidJSON ===================="
-        dirname="rapidjson-${short_ver}"
+        dirname="rapidjson-${rapidjson_ver}"
         pkg_install_dir="${INSTALLDIR}/$dirname"
         #pkg_install_dir="${HOME}/lib/rapidjson/${rapidjson_ver}"
         install_lock_file="${pkg_install_dir}/install_successful"
         # url construction rules:
         # - Branch names (master, main, develop) without v prefix
         # - Version tags (e.g., 1.0.0) with v prefix
-        if [[ "${rapidjson_ver}" =~ ^[0-9a-f]{7}$ ]]; then
+        if [[ "${rapidjson_ver}" =~ ^([0-9a-f]{7}|[0-9a-f]{40})$ ]]; then
             url="https://codeload.github.com/Tencent/rapidjson/tar.gz/${rapidjson_ver}"
         else
             url="https://codeload.github.com/Tencent/rapidjson/tar.gz/v${rapidjson_ver}"
         fi
-        filename="rapidjson-${short_ver}.tar.gz"
+        filename="rapidjson-${rapidjson_ver}.tar.gz"
         if verify_checksums "${install_lock_file}"; then
             echo "$dirname is already installed, skipping it."
         else