Remove one more python2 remnant. This is a fix for the
authorWard Vandewege <ward@curii.com>
Fri, 20 Nov 2020 22:31:50 +0000 (17:31 -0500)
committerWard Vandewege <ward@curii.com>
Fri, 20 Nov 2020 22:34:52 +0000 (17:34 -0500)
python3-arvados-cwl-runner package, it now installs /usr/bin/cwltool
again.

refs #15888

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

build/run-library.sh

index a085843d29de42f621a221fb73faf9edc345e9d1..361a3de81eefdc789cd8eb3e7194f19dfff1a56b 100755 (executable)
@@ -703,9 +703,9 @@ fpm_build_virtualenv () {
     done
   fi
 
-  # the python-arvados-cwl-runner package comes with cwltool, expose that version
-  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
-    COMMAND_ARR+=("usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
+  # the python3-arvados-cwl-runner package comes with cwltool, expose that version
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
   fi
 
   COMMAND_ARR+=(".")