Merge pull request #52 from desihub/eliminate-cori

Eliminate references to cori and CSCRATCH
desihub · May 31, 2023 · 194b40f · 194b40f
2 parents bf5a69f + 5797990
commit 194b40f
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 529 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -98,8 +98,6 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 python-version: ['3.9']
-        env:
-            DESIUTIL_VERSION: module-script
 
         steps:
             - name: Checkout code
@@ -113,7 +111,7 @@ jobs:
             - name: Install Python dependencies
               run: |
                 python -m pip install --upgrade pip setuptools wheel
-                python -m pip install git+https://github.com/desihub/desiutil.git@${DESIUTIL_VERSION}#egg=desiutil
+                if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; fi
             - name: Generate api.rst
               run: desi_api_file --api ./api.rst desitransfer
             - name: Compare generated api.rst to checked-in version

diff --git a/bin/desi_common_init.sh b/bin/desi_common_init.sh
@@ -17,7 +17,7 @@ kill_switch=${HOME}/stop_desi_transfer
 #
 # Determine the version of pgrep to select options.
 #
-PGREP_VERSION=$(pgrep -V | sed -r 's/[^0-9]+([0-9]+)\.([0-9]+)\.([0-9]+)[^0-9]+/\1\2/')
+PGREP_VERSION=$(pgrep -V | sed -r 's/[^0-9]+([0-9]+)\.([0-9]+)\.([0-9]+)[^0-9]*/\1\2/')
 PGREP_OPTIONS='-a -f'
 [[ ${PGREP_VERSION} == "32" ]] && PGREP_OPTIONS='-l -f'
 #
@@ -28,10 +28,15 @@ start() {
         echo "${kill_switch} detected, will not attempt to start ${PRGFILE}."
         return 0
     fi
-    if [[ -n "$(pgrep ${PGREP_OPTIONS} ${PRGFILE} 2> /dev/null | grep ${DESITRANSFER})" ]]; then
+    local process=$(pgrep ${PGREP_OPTIONS} ${PRGFILE} 2> /dev/null)
+    if [[ -n "$(grep ${DESITRANSFER} <<<${process})" ]]; then
         echo "${THISHOST} ${PRGFILE} is already started."
         return 1
     fi
+    if [[ -n "$(grep $(dirname ${DESITRANSFER}) <<<${process})" ]]; then
+        echo "${THISHOST} another version of ${PRGFILE} may already be running."
+        return 1
+    fi
     #
     # Daemonize: You must disconnect stdin, stdout, and stderr, and make it ignore the hangup signal (SIGHUP).
     #

diff --git a/bin/desi_transfer_daemon.sh b/bin/desi_transfer_daemon.sh