Make remove_path more robust

Author: Growl1234

toolchain/scripts/stage3/install_scalapack.sh

@@ -126,7 +126,6 @@ EOF
 export SCALAPACK_ROOT="${pkg_install_dir}"
 export SCALAPACK_LDFLAGS="${SCALAPACK_LDFLAGS}"
 export SCALAPACK_LIBS="${SCALAPACK_LIBS}"
-export SCALAPACK_ROOT="${pkg_install_dir}"
 export CP_DFLAGS="\${CP_DFLAGS} IF_MPI(-D__SCALAPACK|)"
 export CP_LDFLAGS="\${CP_LDFLAGS} IF_MPI(${SCALAPACK_LDFLAGS}|)"
 export CP_LIBS="IF_MPI(-lscalapack|) \${CP_LIBS}"

toolchain/scripts/stage4/install_cereal.sh

@@ -114,10 +114,6 @@ if [ "$with_cereal" != "__DONTUSE__" ]; then
         cat << EOF > "${BUILDDIR}/setup_cereal"
 prepend_path CPATH "${pkg_install_dir}/include"
 prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
-EOF
-    else
-        cat << EOF > "${BUILDDIR}/setup_cereal"
-export CEREAL_ROOT="${pkg_install_dir}"
 EOF
     fi
     cat "${BUILDDIR}/setup_cereal" >> $SETUPFILE

toolchain/scripts/tool_kit.sh

@@ -743,7 +743,7 @@ remove_path() {
   __path=${__path//:$__directory:/:}
   __path=${__path#$__directory:}
   __path=${__path%:$__directory}
-  __path=$(echo "$__path" | sed "s:^$__directory\$::g")
+  __path=$(echo "$__path" | sed "s#^$__directory\$##g")
   eval $__path_name=\"$__path\"
   export $__path_name
 }