Fix remaining issue

Author: Growl1234

toolchain/scripts/stage4/install_libri.sh

@@ -45,7 +45,7 @@ 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"
@@ -57,7 +57,7 @@ case "$with_libri" in
         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,7 +44,7 @@ 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"
@@ -56,7 +56,7 @@ case "$with_rapidjson" in
         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