Fix linter errors in higher-level packages (#4860)

* Fix linter errors in higher-level packages

Fix the remaining linter errors in packages that won't cause a rebuild
of the entire software stack.

Also fix linter warnings in the same packages, as the package hashes
will change anyway, and this way the warnings won't suddenly crop up
the next time anyone sends a PR including these packages.

* Remove outdated, partial parquet-cpp recipe

This recipe doesn't seem to be working properly, and it has a linter
error due to the double `build_requires` key.

It's also for an old version, hasn't been touched in almost 7 years,
and is not depended upon by any other package, so I assume this is
obsolete.

* Fix PDA Modulefile

Author: TimoWilken

alice-grid-utils.sh

@@ -7,7 +7,7 @@ source: https://gitlab.cern.ch/jalien/alice-grid-utils.git
 
 DST="$INSTALLROOT/include"
 mkdir -p "$DST"
-cp -v $SOURCEDIR/*.h "$DST/"
+cp -v "$SOURCEDIR"/*.h "$DST/"
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
@@ -21,3 +21,4 @@ proc ModulesHelp { } {
 }
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+EoF

fairmq.sh

@@ -15,8 +15,9 @@ incremental_recipe: |
   cmake --build . --target install ${JOBS:+-- -j$JOBS}
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
 prepend_path:
-  ROOT_INCLUDE_PATH: "$FAIRMQ_ROOT/include"
-  ROOT_INCLUDE_PATH: "$FAIRMQ_ROOT/include/fairmq"
+  ROOT_INCLUDE_PATH:
+    - "$FAIRMQ_ROOT/include"
+    - "$FAIRMQ_ROOT/include/fairmq"
 ---
 mkdir -p $INSTALLROOT
 

glog.sh

@@ -2,10 +2,11 @@ package: glog
 version: v0.4.0
 source: https://github.com/google/glog
 build_requires:
- - "autotools:(slc6|slc7)"
- - "GCC-Toolchain:(?!osx)"
---- 
-rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
+  - "autotools:(slc6|slc7)"
+  - "GCC-Toolchain:(?!osx)"
+---
+#!/bin/bash -e
+rsync -av --delete --exclude='**/.git' "$SOURCEDIR/" .
 autoreconf -ivf
 ./configure --prefix="$INSTALLROOT"
 make ${JOBS:+-j $JOBS}

looptools.sh

@@ -8,23 +8,20 @@ build_requires:
   - alibuild-recipe-tools
 ---
 #!/bin/bash -e
-rsync -a $SOURCEDIR/ ./
+rsync -a "$SOURCEDIR/" ./
 
-./configure --prefix=$INSTALLROOT \
-            --64 
+./configure --prefix="$INSTALLROOT" --64
 
 make ${JOBS+-j $JOBS}
 make install
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module > etc/modulefiles/$PKGNAME
-cat >> etc/modulefiles/$PKGNAME <<EoF
+alibuild-generate-module --bin --lib > "etc/modulefiles/$PKGNAME"
+cat >> "etc/modulefiles/$PKGNAME" <<EoF
 # Our environment
 setenv LOOPTOOLS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(LOOPTOOLS_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(LOOPTOOLS_ROOT)/lib
 prepend-path LD_LIBRARY_PATH \$::env(LOOPTOOLS_ROOT)/lib64
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(LOOPTOOLS_ROOT)/lib: \$::env(LOOPTOOLS_ROOT)/lib64")
 EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+rsync -a --delete etc/modulefiles/ "$INSTALLROOT/etc/modulefiles"

mesos-workqueue.sh

@@ -3,24 +3,25 @@ version: 0.0.2-%(short_hash)s
 tag: master
 source: https://github.com/alisw/mesos-workqueue
 requires:
-- mesos
-- protobuf
-- boost
-- glog
+  - mesos
+  - protobuf
+  - boost
+  - glog
 build_requires:
-- CMake
---- 
-case $ARCHITECTURE in 
+  - CMake
+---
+#!/bin/bash -e
+case $ARCHITECTURE in
   osx*)
     [[ -z "$BOOST_ROOT" ]] && BOOST_ROOT=$(brew --prefix boost)
   ;;
 esac
 cmake "$SOURCEDIR"                               \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT        \
-      -DPROTOBUF_ROOT=${PROTOBUF_ROOT}           \
-      -DMESOS_ROOT=${MESOS_ROOT}                 \
-      ${BOOST_ROOT:+-DBOOST_ROOT=${BOOST_ROOT}}  \
-      -DGLOG_ROOT=${GLOG_ROOT}
+      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"      \
+      -DPROTOBUF_ROOT="$PROTOBUF_ROOT"           \
+      -DMESOS_ROOT="$MESOS_ROOT"                 \
+      ${BOOST_ROOT:+-DBOOST_ROOT="$BOOST_ROOT"}  \
+      -DGLOG_ROOT="$GLOG_ROOT"
 make ${JOBS:+-j $JOBS}
 make install
 

openloops.sh

@@ -11,39 +11,36 @@ build_requires:
   - alibuild-recipe-tools
 ---
 #!/bin/bash -e
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ .
+rsync -a --delete --exclude '**/.git' --delete-excluded "$SOURCEDIR/" .
 
 unset HTTP_PROXY # unset this to build on slc6 system
 
 # Due to typical long install dir paths used by aliBuild, the string lengths must be increased
 sed -i -e 's/max_string_length\ =\ 255/max_string_length\ =\ 1000/g' pyol/config/default.cfg
 
-./scons 
+./scons
 
 JOBS=$((${JOBS:-1}*1/5))
 [[ $JOBS -gt 0 ]] || JOBS=1
 
-PROCESSES=(ppjj ppjj_ew ppjjj ppjjj_ew ppjjj_nf5 ppjjjj)
-for proc in ${PROCESSES[@]}; do
-    ./scons --jobs=$JOBS auto="$proc"  
+for proc in ppjj ppjj_ew ppjjj ppjjj_ew ppjjj_nf5 ppjjjj; do
+  ./scons --jobs="$JOBS" "auto=$proc"
 done
 
-INSTALL=(examples include lib openloops proclib pyol)
-for inst in ${INSTALL[@]}; do
-    cp -r $inst $INSTALLROOT/
+for inst in examples include lib openloops proclib pyol; do
+  cp -r "$inst" "$INSTALLROOT/"
 done
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module > etc/modulefiles/$PKGNAME
-cat >> etc/modulefiles/$PKGNAME <<EoF
+alibuild-generate-module --bin --lib > "etc/modulefiles/$PKGNAME"
+cat >> "etc/modulefiles/$PKGNAME" <<EoF
 # Our environment
 set OPENLOOPS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv OPENLOOPS_ROOT \$OPENLOOPS_ROOT
 setenv OpenLoopsPath \$OPENLOOPS_ROOT
-prepend-path PATH \$OPENLOOPS_ROOT
-prepend-path LD_LIBRARY_PATH \$OPENLOOPS_ROOT/lib
 prepend-path LD_LIBRARY_PATH \$OPENLOOPS_ROOT/proclib
 EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+rsync -a --delete etc/modulefiles/ "$INSTALLROOT/etc/modulefiles"
 

openmp.sh

@@ -1,5 +1,5 @@
 package: openmp
-version: 1.0
+version: "1.0"
 system_requirement_missing: |
   Please install openmp (libomp) on your system:
     * On MacOS systems: brew install libomp

parquet-cpp.sh

@@ -7,34 +7,20 @@ requires:
 build_requires:
   - kernel-devel
   - "autotools:(slc6|slc7)"
+  - alibuild-recipe-tools
+---
+#!/bin/bash -e
 
---- 
-#!/bin/sh
-
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
-./configure --debug=false --numa=true --modprobe=true --prefix=$INSTALLROOT
+rsync -a --delete --exclude '**/.git' --delete-excluded "$SOURCEDIR/" ./
+./configure --debug=false --numa=true --modprobe=true --prefix="$INSTALLROOT"
 make ${JOBS+-j $JOBS} install
 
-#ModuleFile 
+#ModuleFile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-
-# Dependencies
-module load BASE/1.0                                                                            \\
-            ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}                       
-
+alibuild-generate-module --bin --lib > "etc/modulefiles/$PKGNAME"
+cat >> "etc/modulefiles/$PKGNAME" <<EoF
 # Our environment
-set PDA_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv PDA_ROOT \$PDA_ROOT
-set BASEDIR \$::env(BASEDIR)
-prepend-path PATH \$BASEDIR/$PKGNAME/\$version/bin
-prepend-path LD_LIBRARY_PATH \$BASEDIR/$PKGNAME/\$version/lib
+setenv PDA_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+rsync -a --delete etc/modulefiles/ "$INSTALLROOT/etc/modulefiles"

pda.sh

@@ -1,5 +1,5 @@
 package: RivetTask
-version: "%{year}s%{month}s%{day}s"
+version: "%(year)s%(month)s%(day)s"
 source: https://gitlab.cern.ch/cholm/alice-rivet-task
 requires:
   - Rivet
@@ -19,28 +19,24 @@ set -x
 # Print environment to see what is going on - debugging
 printenv
 
-# Copy code here 
-cp ${SOURCEDIR}/AliRivetTask.C .
-cp ${SOURCEDIR}/Build.C .
+# Copy code here
+cp "$SOURCEDIR/AliRivetTask.C" .
+cp "$SOURCEDIR/Build.C" .
 
-# Use AcLic to build 
+# Use AcLic to build
 root -l -b -q Build.C
 
-# Install binary, scripts, and code 
-mkdir -p ${INSTALLROOT}/lib
-mkdir -p ${INSTALLROOT}/include
-mkdir -p ${INSTALLROOT}/share
-cp ${SOURCEDIR}/AliRivetTask.C p ${INSTALLROOT}/include
-cp ${SOURCEDIR}/AliRivetTask_C*  ${INSTALLROOT}/lib/
-cp ${SOURCEDIR}/AddTaskRivet.C   ${INSTALLROOT}/share/
-cp ${SOURCEDIR}/RivetConfig.C    ${INSTALLROOT}/share/
+# Install binary, scripts, and code
+mkdir -p "$INSTALLROOT/lib"
+mkdir -p "$INSTALLROOT/include"
+mkdir -p "$INSTALLROOT/share"
+cp "$SOURCEDIR/AliRivetTask.C"  "$INSTALLROOT/include"
+cp "$SOURCEDIR/AliRivetTask_C"* "$INSTALLROOT/lib/"
+cp "$SOURCEDIR/AddTaskRivet.C"  "$INSTALLROOT/share/"
+cp "$SOURCEDIR/RivetConfig.C"   "$INSTALLROOT/share/"
 
 #ModuleFile
-mkdir -p modulefiles
-alibuild-generate-module > etc/modulefiles/$PKGNAME
-cat >> modulefiles/${PKGNAME} <<EOF
-
-EOF
-mkdir -p $INSTALLROOT/etc/modulefiles && \
-    rsync -a --delete modulefiles/ $INSTALLROOT/etc/modulefiles
-
+mkdir -p etc/modulefiles
+alibuild-generate-module > "etc/modulefiles/$PKGNAME"
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+rsync -a --delete modulefiles/ "$INSTALLROOT/etc/modulefiles"