COMP: fix merge typos

Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx

@@ -149,8 +149,7 @@ CommandLineParser::ParseResultType CommandLineParser::GetPaths(std::vector<std::
 
   if (tempModPath.size() > 0)
   {
-    std::vector<std::string> pathAttribut = itksys::SystemTools::SplitString(tempModPath, ' ', false);
-
+    std::vector<std::string> pathAttribute = itksys::SystemTools::SplitString(tempModPath, ' ', false);
 
     // Remove " " string element
     for (unsigned int i = 0; i < pathAttribute.size(); i++)

Packaging/Files/post_install.sh.in

@@ -35,18 +35,17 @@ sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/gdal-co
 sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/curl-config
 sh "$OTB_INSTALL_DIR"/tools/sanitize_rpath.sh
 
-# Check python version, if python 3.10 (ubuntu 22 and debian 12) download and extract the gdal bindings for python 3.10
+# Check python version, if python 3.12 (ubuntu 24 and debian > 12) download and extract the gdal bindings for python 3.12
 pyversion="$(python3 -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]*\).*/\1\2/')"
 if [ "$pyversion" = "312" ]; then
     echo "***** Python 3.12 detected, downloading gdal bindings compiled for python 3.12 *****"
-    PACKAGE_OTB_VERSION="$OTB_SHORT_VERSION.@OTB_VERSION_PATCH@"
     HTTP_STATUS=$(curl -s -o "$OTB_INSTALL_DIR"/tools/py312.tar.gz -w "%{response_code}\n" https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz)
     if [ $HTTP_STATUS -eq 200 ]; then
         tar -xf "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz -C "$OTB_INSTALL_DIR"/lib/python3/dist-packages/osgeo/
         rm "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz
         echo "*** GDAL bindings for python 3.12 successfully installed ***"
     else
-        echo "Can not find GDAL bindings at https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.1-GDAL-bindings-py$pyversion.tar.gz"
+        echo "Can not find GDAL bindings at https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz"
         return -1
     fi
     sh "$OTB_INSTALL_DIR"/recompile_bindings.sh