Fix meta creation

Author: jwokaty

propagation/3.20/updateReposPkgs-bioc.sh

@@ -17,6 +17,9 @@ WIN_CONTRIB="$REPOS_ROOT/bin/windows/contrib/$R_VERSION"
 MAC_BIG_SUR_x86_64_CONTRIB="$REPOS_ROOT/bin/macosx/big-sur-x86_64/contrib/$R_VERSION"
 MAC_BIG_SUR_arm64_CONTRIB="$REPOS_ROOT/bin/macosx/big-sur-arm64/contrib/$R_VERSION"
 
+META_SRC="$SRC_CONTRIB/Meta"
+META_R_EXPR="source('/home/biocbuild/BBS/utils/makeMetaDbs.R')"
+
 if [ ! -f "$PROPAGATION_DB_FILE" ]; then
         echo "ERROR: $PROPAGATION_DB_FILE not found. Did postrun.sh run?"
         exit 1
@@ -63,6 +66,7 @@ echo "========================================================================"
 /bin/date
 echo "------------------------------------------------------------------------"
 
+echo "Updating $META_SRC with aliases and cross refences dbs..."
 $Rscript -e "$META_R_EXPR; try(makeMetaDbs('$PROPAGATION_DB_FILE', '$REPOS_ROOT', '$META_SRC'))"
 
 echo ""
@@ -83,8 +87,5 @@ for i in `ls $MANUALS_SRC`; do
 	cp --update --verbose $MANUALS_SRC/$i $MANUALS_DEST/$pkg/man
 done
 
-echo "Updating $SRC_CONTRIB with aliases and cross references dbs ..."
-cp --recursive --update --verbose $META_SRC $SRC_CONTRIB
-
 echo "DONE."
 exit 0

propagation/3.21/updateReposPkgs-bioc.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -e  # exit immediately if a simple command returns a non-zero status
 
 cd "$HOME/propagation/3.21"
@@ -19,6 +18,7 @@ MAC_BIG_SUR_arm64_CONTRIB="$REPOS_ROOT/bin/macosx/big-sur-arm64/contrib/$R_VERSI
 
 META_SRC="$SRC_CONTRIB/Meta"
 META_R_EXPR="source('/home/biocbuild/BBS/utils/makeMetaDbs.R')"
+MEAT_PATH="/home/biocbuild/bbs-$BIOC_VERSION-bioc/meat"
 
 if [ ! -f "$PROPAGATION_DB_FILE" ]; then
         echo "ERROR: $PROPAGATION_DB_FILE not found. Did postrun.sh run?"
@@ -66,7 +66,8 @@ echo "========================================================================"
 /bin/date
 echo "------------------------------------------------------------------------"
 
-$Rscript -e "$META_R_EXPR; try(makeMetaDbs('$PROPAGATION_DB_FILE', '$REPOS_ROOT', '$META_SRC'))"
+echo "Updating $META_SRC with aliases and cross refences dbs..."
+$Rscript -e "$META_R_EXPR; try(makeMetaDbs('$PROPAGATION_DB_FILE', '$MEAT_PATH', '$REPOS_ROOT', '$META_SRC'))"
 
 echo ""
 
@@ -86,8 +87,5 @@ for i in `ls $MANUALS_SRC`; do
 	cp --update --verbose $MANUALS_SRC/$i $MANUALS_DEST/$pkg/man
 done
 
-echo "Updating $SRC_CONTRIB with aliases and cross references dbs ..."
-cp --recursive --update --verbose $META_SRC $SRC_CONTRIB
-
 echo "DONE."
 exit 0

utils/makeMetaDbs.R

@@ -12,7 +12,7 @@ makeMetaDbs <- function(db_filepath, repos_root, meta_path) {
     }
   }
 
-  web_dir <- file.path(repos_root "web", "packages")
+  web_dir <- file.path(repos_root, "web", "packages")
   meta_dir <- file.path(meta_path)
   if (!dir.exists(meta_dir)) {
     dir.create(meta_dir, recursive = TRUE)