Merge remote-tracking branch 'upstream/develop' into x3d_3d_ssfile

lanl · Jul 9, 2021 · 6f15349 · 6f15349
2 parents 3af00c7 + dcb5c56
commit 6f15349
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/environment/bashrc/bash_functions.sh b/environment/bashrc/bash_functions.sh
@@ -321,7 +321,7 @@ function qrm ()
     fi
 
     # Identify the scratch system
-    trashdir="${fqd//${USER}*/${USER}\/trash}"
+    trashdir="${fqd//${USER}*/${USER}/trash}"
 
     # ensure trash folder exists.
     if ! [[ -d "$trashdir" ]]; then mkdir -p "$trashdir"; fi

diff --git a/environment/bashrc/bashrc_slurm b/environment/bashrc/bashrc_slurm
@@ -90,15 +90,15 @@ case ${-} in
        echo -e "\n${boldface}RUNNING${normalface}":
        # echo " squeue ${squeue_args} -o \"%.7i %.10u %.10a %.8q %.9P %.16j %.6D %.6C %.12L %S\" -S \"L\" -t R"
        # shellcheck disable=SC2086
-       squeue ${squeue_args} -o "%.7i %.10u %.10a %.8q %.9P %.16j %.6D %.6C %.12L %S" -S "L" -t R | grep --color -E ".*${hluser}.*|$"
+       squeue ${squeue_args} -o "%.7i %.8u %.8a %.8q %.9P %.24j %.6D %.6C %.12L %S" -S "L" -t R | grep --color -E ".*${hluser}.*|$"
      fi
      # shellcheck disable=SC2086
      if ! [[ $(squeue ${squeue_args} -h -t PD | wc -l) == 0 ]]; then
        echo -e "\n${boldface}PENDING:${normalface}"
        # shellcheck disable=SC2086
-       squeue ${squeue_args} -o "%.7i %.8Q %.10u %.10a %.8q %.9P %.16j %.6C %.16S %.10L %.r" -t PD --sort=S,-p | grep -v "N/A" | grep --color -E ".*${hluser}.*|$"
+       squeue ${squeue_args} -o "%.7i %.8u %.8a %.8q %.9P %.24j %.6C %.16S %.10L %.8Q %.r" -t PD --sort=S,-p | grep -v "N/A" | grep --color -E ".*${hluser}.*|$"
        # shellcheck disable=SC2086
-       squeue ${squeue_args} -o "%.7i %.8Q %.10u %.10a %.8q %.9P %.16j %.6C %.16S %.10L %.r" -t PD --sort=S,-p | grep --color=never "N/A" | grep --color -E ".*${hluser}.*|$"
+       squeue ${squeue_args} -o "%.7i %.8u %.8a %.8q %.9P %.24j %.6C %.16S %.10L %.8Q %.r" -t PD --sort=S,-p | grep --color=never "N/A" | grep --color -E ".*${hluser}.*|$"
      fi
 #     if ! [[ `squeue ${squeue_args} -h -t S,CG,CF,F,TO,PR,NF | wc -l` == 0 ]]; then
 #       echo -e "\n${boldface}OTHER:${normalface}"