Update eessi_environment_variables

Author: ocaisa

init/eessi_environment_variables

@@ -70,13 +70,15 @@ if [ -d $EESSI_PREFIX ]; then
               if [ ! -d $EESSI_ACCEL_SOFTWARE_PATH/${EESSI_ACCEL_SUBDIR} ]; then
                   # We should try to use the fallback compute capability
                   show_msg "archdetect found no supported accelerator ${EESSI_ACCEL_SUBDIR}, falling back to ${EESSI_ACCEL_SUBDIR::-1}0"
-                  EESSI_ACCEL_SUBDIR="${EESSI_ACCEL_SUBDIR::-1}0"
+                  EESSI_ACCELERATOR_TARGET="${EESSI_ACCEL_SUBDIR::-1}0"
+              else
+                  EESSI_ACCELERATOR_TARGET="${EESSI_ACCEL_SUBDIR}
               fi
-              if [ -d $EESSI_ACCEL_SOFTWARE_PATH/${EESSI_ACCEL_SUBDIR} ]; then
-                  show_msg "archdetect found supported accelerator for CPU target ${EESSI_ACCEL_SOFTWARE_SUBDIR}: ${EESSI_ACCEL_SUBDIR}"
-                  export EESSI_ACCELERATOR_TARGET=${EESSI_ACCEL_SUBDIR}
+              if [ -d $EESSI_ACCEL_SOFTWARE_PATH/${EESSI_ACCELERATOR_TARGET} ]; then
+                  show_msg "archdetect found supported accelerator for CPU target ${EESSI_ACCEL_SOFTWARE_SUBDIR}: ${EESSI_ACCELERATOR_TARGET}"
+                  export EESSI_ACCELERATOR_TARGET
               else
-                  show_msg "No matching path found in ${EESSI_ACCEL_SOFTWARE_SUBDIR} for accelerator detected by archdetect (${EESSI_ACCEL_SUBDIR})"
+                  show_msg "No matching path found in ${EESSI_ACCEL_SOFTWARE_SUBDIR} for accelerator detected by archdetect (${EESSI_ACCELERATOR_TARGET})"
               fi
           fi
       else