cleanup of startup scripts

.github/workflows/template.yml

@@ -51,7 +51,7 @@ jobs:
           bundler-cache: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
@@ -131,7 +131,7 @@ jobs:
 
       - name: Set up R
         if: steps.check-rmd.outputs.count != 0
-        uses: r-lib/actions/setup-r@v2
+        uses: r-lib/actions/setup-r@v1
         with:
           use-public-rspm: true
           install-r: false

.github/workflows/website.yml

@@ -17,13 +17,14 @@ jobs:
         shell: bash
     steps:
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v3
+        uses: ruby/setup-ruby@v1
+
         with:
           ruby-version: '3.0'
           bundler-cache: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
@@ -48,14 +49,14 @@ jobs:
 
       - name: Set up R
         if: steps.check-rmd.outputs.count != 0
-        uses: r-lib/actions/setup-r@v2
+        uses: r-lib/actions/setup-r@v1
         with:
           use-public-rspm: true
           install-r: false
 
       - name: Restore R Cache
         if: steps.check-rmd.outputs.count != 0
-        uses: actions/cache@v2
+        uses: actions/cache@v1
         with:
           path: ${{ env.R_LIBS_USER }}
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

_extras/Common-Error-Messages.md

@@ -5,41 +5,44 @@ keypoints:
 - Errors that people report in doing the tutorial
 --- 
 
-#### `/usr/bin/xauth: unable to write authority file`
-#### `disk quota exceeded error with metacat auth login`
+- ####  `/usr/bin/xauth: unable to write authority file`
+  #### `disk quota exceeded error with metacat auth login`
 
-  These likely means your kerberos ticket was not forwarded and you can't access your home are without it.  do a kinit in your terminal session.  Or possibly you really have filled your home area. 
+    These likely means your kerberos ticket was not forwarded and you can't access your home are without it.  do a kinit in your terminal session.  Or possibly you really have filled your home area. 
 
-#### `bash: setup: command not found`
+- #### `bash: setup: command not found`
 
-setup is a UPS command.  You need to be running in the Apptainer and setup the DUNE ups system - check out the instructions in [SL7 setup]
-({{ site.baseurl }}/sl7_setup)
+  setup is a UPS command.  You need to be running in the Apptainer and setup the DUNE ups system - check out the instructions in [SL7 setup]
+  ({{ site.baseurl }}/sl7_setup)
 
 
-#### `SyntaxError: future feature annotations is not defined` 
+- #### `SyntaxError: future feature annotations is not defined` 
 
-This looks like a bad python version, try doing `which python` if it isn't > 3.9 you don't have a modern python version.
+    This looks like a bad python version, try doing `which python` if it isn't > 3.9 you don't have a modern python version.
 
-- On SL7 we suggest setting up the dunesw as shown in the example setup. alternatively you can 
+    - On SL7 we suggest setting up the dunesw as shown in the example setup. alternatively you can 
 
-    ~~~
-    setup root -v v6_28_12 -q e26:p3915:prof
-    ~~~
-    {: .language-bash} 
+        ~~~
+        setup root -v v6_28_12 -q e26:p3915:prof
+        ~~~
+        {: .language-bash} 
 
-- On AL9 we suggest loading ROOT which brings in a modern version of python and allows xrootd access to data. 
+    - On AL9 we suggest loading ROOT which brings in a modern version of python and allows xrootd access to data. 
 
-    ~~~
-    spack load [email protected]
-    ~~~
-    {: .language-bash} 
+        ~~~
+        spack load [email protected]
+        ~~~
+        {: .language-bash} 
 
 
-#### Spack ==> `Error: somecode matches multiple packages`
+- #### Spack ==> `Error: somecode matches multiple packages
+  ~~~
   Matching packages:
     jhpj2js [email protected]%[email protected] arch=linux-almalinux9-x86_64_v2
     sfwfmqo [email protected]%[email protected] arch=linux-almalinux9-x86_64_v2
   Use a more specific spec (e.g., prepend '/' to the hash).
+  ~~~
+  {: .language-bash} 
 
   Choose a version and then
   ~~~

_extras/al9_setup.md

@@ -9,23 +9,18 @@ keypoints:
 You can store the code below as 
  `myal9.sh` and run it every time you log in. 
 
-> ##Note - the full LArSoft suite doesn't work yet with spack
+> ## Note - the full LArSoft suite doesn't work yet with spack
 > Use the [Apptainer/sl7 method]({{ site.baseurl }}al9_setup.html) until we get that working if you want to use the full DUNE software suite. 
 {: .callout}
 
 ~~~
 
 # use spack to get applications
 source /cvmfs/larsoft.opensciencegrid.org/spack-packages/setup-env.sh 
-spack load [email protected]
-spack load [email protected]
-spack load [email protected]
-spack load [email protected]
 
 # load metacat, rucio and sam and tell it you are on dune
 spack load r-m-dd-config  experiment=dune
 spack load kx509
-export SAM_EXPERIMENT=dune
 export IFDH_CP_MAXRETRIES=0\0\0\0\0  # no retries
 export RUCIO_ACCOUNT=$USER
 
@@ -50,3 +45,14 @@ export BEARER_TOKEN_FILE=/run/user/`id -u`/bt_u`id -u`
 
 ~~~
 {: .language-bash}
+
+------------------------
+
+## setup specific versions of code here
+
+~~~
+spack load [email protected]  # recent with xrootd
+spack load [email protected]
+spack load [email protected]
+~~~
+{: .language-bash}

_extras/sl7_setup.md

@@ -36,9 +36,8 @@ you can store this as
 `mysl7.sh` and run it every time you log in.  
 
 ~~~
-# use ups to find programs
+# use ups to find programs - this only works on SL7
 
-export UPS_OVERRIDE="-H Linux64bit+3.10-2.17"
 source /cvmfs/dune.opensciencegrid.org/products/dune/setup_dune.sh
 setup metacat
 setup rucio
@@ -68,11 +67,13 @@ voms-proxy-init -rfc -noregen -voms dune:/dune/Role=$ROLE -valid 24:00
 export X509_USER_PROXY=/tmp/x509up_u`id -u`
 
 htgettoken -i dune --vaultserver htvaultprod.fnal.gov
-
 export BEARER_TOKEN_FILE=/run/user/`id -u`/bt_u`id -u`
 
-## you need to change these to match current versions
+--------------------------------------------------------
+
+## This you need to update yourself to get new versions of DUNE software
 
+~~~
 export DUNELAR_VERSION=v10_00_04d00
 export DUNELAR_QUALIFIER=e26:prof