Perform git pull on artdaq branches in setup_spack_build_system. Update quick-spack-start scripts sha1sum

Author: eflumerf

tools/art-suite-spack-start_v0.28.sh

@@ -103,7 +103,7 @@ if [[ "x$build_system_script" == "x" ]];then
   build_system_script=$Base/setup_spack_build_system_v0.28.sh
 fi
 
-echo "fee1e3b2de18c535f9800b66e5007bb0f5cbfe5a *$build_system_script" | sha1sum -c -
+echo "5bfade30fa8b3da95d2f904a17e602f033c326b5 *$build_system_script" | sha1sum -c -
 if [ $? -ne 0 ]; then
   echo "ERROR: setup_spack_build_system_v0.28.sh does not have the expected checksum! Please check Github for updates to this script!"
   exit 1

tools/art-suite-spack-start_v1.1.sh

@@ -101,7 +101,7 @@ if [[ "x$build_system_script" == "x" ]];then
   build_system_script=$Base/setup_spack_build_system_v1.1.sh
 fi
 
-echo "d49e9cce2e3484e0150e558a3c7b5de9fe341ca2 *$build_system_script" | sha1sum -c -
+echo "ce1d0c139329e507b81af324aff6682880c184d5 *$build_system_script" | sha1sum -c -
 if [ $? -ne 0 ]; then
   echo "ERROR: setup_spack_build_system_v1.1.sh does not have the expected checksum! Please check Github for updates to this script!"
   exit 1

tools/quick-spack-start_v0.28.sh

@@ -149,7 +149,7 @@ if [[ "x$build_system_script" == "x" ]];then
   build_system_script=$Base/setup_spack_build_system_v0.28.sh
 fi
 
-echo "fee1e3b2de18c535f9800b66e5007bb0f5cbfe5a *$build_system_script" | sha1sum -c -
+echo "5bfade30fa8b3da95d2f904a17e602f033c326b5 *$build_system_script" | sha1sum -c -
 if [ $? -ne 0 ]; then
   echo "ERROR: setup_spack_build_system_v0.28.sh does not have the expected checksum! Please check Github for updates to this script!"
   exit 1

tools/quick-spack-start_v1.1.sh

@@ -149,7 +149,7 @@ if [[ "x$build_system_script" == "x" ]];then
   build_system_script=$Base/setup_spack_build_system_v1.1.sh
 fi
 
-echo "d49e9cce2e3484e0150e558a3c7b5de9fe341ca2 *$build_system_script" | sha1sum -c -
+echo "ce1d0c139329e507b81af324aff6682880c184d5 *$build_system_script" | sha1sum -c -
 if [ $? -ne 0 ]; then
   echo "ERROR: setup_spack_build_system_v1.1.sh does not have the expected checksum! Please check Github for updates to this script!"
   exit 1

tools/setup_spack_build_system_v0.28.sh

@@ -10,8 +10,7 @@ function install_spack_build_system()
         git clone https://github.com/art-daq/spack.git -b eflumerf/FixPerlPackageStash
             )
     else
-        #cd $spackdir && git pull && cd $Base
-        cd $spackdir && git fetch -a && git checkout eflumerf/FixPerlPackageStash ; cd $Base
+        cd $spackdir && git checkout eflumerf/FixPerlPackageStash && git pull ; cd $Base
     fi
 
     cat >setup-env.sh <<-EOF
@@ -23,20 +22,14 @@ EOF
     source setup-env.sh
 
     if ! [ -d fermi-spack-tools ]; then
-        #git clone https://github.com/FNALssi/fermi-spack-tools.git # Upstream
-        #cd fermi-spack-tools && git checkout 965e0e73896328f8137c2bd53bad77a42b39e0bf; cd $Base
-        git clone https://github.com/art-daq/fermi-spack-tools.git # Fork
-        cd fermi-spack-tools && git checkout artdaq/Spack0.28; cd $Base
+        git clone https://github.com/art-daq/fermi-spack-tools.git -b artdaq/Spack0.28
     else
-        #cd fermi-spack-tools && git fetch -a && git checkout 965e0e73896328f8137c2bd53bad77a42b39e0bf ; cd $Base # Upstream
-        cd fermi-spack-tools && git fetch -a && git checkout artdaq/Spack0.28 ; cd $Base # Fork
+        cd fermi-spack-tools && git checkout artdaq/Spack0.28 && git pull ; cd $Base
     fi
     if ! [ -d spack-mpd ]; then
-        # git clone https://github.com/FNALssi/spack-mpd.git # Upstream
-        git clone https://github.com/art-daq/spack-mpd.git # Fork
-        cd spack-mpd && git checkout artdaq/Spack0.28; cd $Base
+        git clone https://github.com/art-daq/spack-mpd.git -b artdaq/Spack0.28
     else
-        cd spack-mpd && git fetch -a && git checkout artdaq/Spack0.28; cd $Base
+        cd spack-mpd && git checkout artdaq/Spack0.28 && git pull; cd $Base
     fi
 
     os=$(spack arch -o)
@@ -81,7 +74,7 @@ EOF
         git clone https://github.com/art-daq/artdaq-spack.git -b artdaq/Spack0.28
         spack repo add ./artdaq-spack
     else
-        cd artdaq-spack && git fetch -a && git checkout artdaq/Spack0.28; cd $Base/spack-repos
+        cd artdaq-spack && git checkout artdaq/Spack0.28 && git pull; cd $Base/spack-repos
     fi
 
     repo_found=`spack repo list|awk '{print $1}'|grep -c mu2e-spack`
@@ -90,7 +83,7 @@ EOF
         git clone https://github.com/Mu2e/mu2e-spack.git -b artdaq/Spack0.28
         spack repo add ./mu2e-spack
     else
-        cd mu2e-spack && git fetch -a && git checkout artdaq/Spack0.28; cd ${Base}/spack-repos
+        cd mu2e-spack && git checkout artdaq/Spack0.28 && git pull; cd ${Base}/spack-repos
     fi
     cd $Base
 

tools/setup_spack_build_system_v1.1.sh

@@ -12,8 +12,7 @@ function install_spack_build_system()
         git clone https://github.com/art-daq/spack.git -b artdaq/Spack1.1
             )
     else
-        #cd $spackdir && git pull && cd $Base
-        cd $spackdir && git fetch -a && git checkout artdaq/Spack1.1 ; cd $Base
+        cd $spackdir && git checkout artdaq/Spack1.1 && git pull; cd $Base
     fi
 
     cat >setup-env.sh <<-EOF
@@ -27,19 +26,14 @@ EOF
     source setup-env.sh
 
     if ! [ -d fermi-spack-tools ]; then
-        #git clone https://github.com/FNALssi/fermi-spack-tools.git # Upstream
-        #cd fermi-spack-tools && git checkout 965e0e73896328f8137c2bd53bad77a42b39e0bf; cd $Base
-        git clone https://github.com/art-daq/fermi-spack-tools.git # Fork
-        cd fermi-spack-tools && git checkout artdaq/Spack1.1; cd $Base
+        git clone https://github.com/art-daq/fermi-spack-tools.git -b artdaq/Spack1.1
     else
-        #cd fermi-spack-tools && git fetch -a && git checkout 965e0e73896328f8137c2bd53bad77a42b39e0bf ; cd $Base # Upstream
-        cd fermi-spack-tools && git fetch -a && git checkout artdaq/Spack1.1 ; cd $Base # Fork
+        cd fermi-spack-tools && git checkout artdaq/Spack1.1 && git pull; cd $Base
     fi
     if ! [ -d spack-mpd ]; then
-        git clone https://github.com/art-daq/spack-mpd.git # Fork
-        cd spack-mpd && git checkout artdaq/Spack1.1; cd $Base
+        git clone https://github.com/art-daq/spack-mpd.git -b artdaq/Spack1.1
     else
-        cd spack-mpd && git fetch -a && git checkout artdaq/Spack1.1; cd $Base
+        cd spack-mpd && git checkout artdaq/Spack1.1 && git pull; cd $Base
     fi
 
     os=$(spack arch -o)
@@ -75,7 +69,7 @@ EOF
         git clone https://github.com/art-daq/spack-packages.git -b artdaq/Spack1.1
         spack repo add ./spack-packages/repos/spack_repo/builtin
     else
-        cd spack-packages && git fetch -a && git checkout artdaq/Spack1.1; cd $Base/spack-repos
+        cd spack-packages && git checkout artdaq/Spack1.1 && git pull; cd $Base/spack-repos
     fi
 
     repo_found=`spack repo list|grep -c spack-repos/fnal_art`
@@ -104,7 +98,7 @@ EOF
         git clone https://github.com/art-daq/artdaq-spack.git -b artdaq/Spack1.1
         spack repo add ./artdaq-spack/spack_repo/artdaq_spack
     else
-        cd artdaq-spack && git fetch -a && git checkout artdaq/Spack1.1; cd $Base/spack-repos
+        cd artdaq-spack && git checkout artdaq/Spack1.1 && git pull; cd $Base/spack-repos
     fi
 
     repo_found=`spack repo list|grep -c spack-repos/mu2e-spack`
@@ -113,7 +107,7 @@ EOF
         git clone https://github.com/Mu2e/mu2e-spack.git -b artdaq/Spack1.1
         spack repo add ./mu2e-spack/spack_repo/mu2e_spack
     else
-        cd mu2e-spack && git fetch -a && git checkout artdaq/Spack1.1; cd ${Base}/spack-repos
+        cd mu2e-spack && git checkout artdaq/Spack1.1 && git pull; cd ${Base}/spack-repos
     fi
     cd $Base