Pick up jobid from SLURM_JOBID or SLURM_JOB_ID if set.

src/slaunch/opt.c

@@ -667,6 +667,8 @@ struct env_vars {
 };
 
 env_vars_t env_vars[] = {
+  {"SLURM_JOBID",          OPT_INT,       &opt.jobid,         &opt.jobid_set },
+  {"SLURM_JOB_ID",         OPT_INT,       &opt.jobid,         &opt.jobid_set },
   {"SLAUNCH_JOBID",        OPT_INT,       &opt.jobid,         &opt.jobid_set },
   {"SLURMD_DEBUG",         OPT_INT,       &opt.slurmd_debug,  NULL           },
   {"SLAUNCH_CORE_FORMAT",  OPT_CORE,      NULL,               NULL           },