60e8aef8f6340a0ec9f9432d6aa20ac526222fa4
angie
  Wed Jun 24 09:53:51 2020 -0700
For the new hgwdev-demo-user machines, the USER passed in contains a hyphen which can't be part of a mysql table name (e.g. we need trackDb_demo_angie not trackDb_demo-angie), so replace it for table names.

diff --git src/hg/makeDb/trackDb/makefile src/hg/makeDb/trackDb/makefile
index 2452b07..7d448d0 100644
--- src/hg/makeDb/trackDb/makefile
+++ src/hg/makeDb/trackDb/makefile
@@ -197,39 +197,43 @@
 ARCHIVED_DBS = \
 	rheMac1 \
 	danRer1 \
 	mm5 \
 	mm6 \
 	danRer2
 
 # if trix build breaks, disable by setting to /bin/true instead of ./buildTrix
 # BUILD_TRIX = /bin/true
 BUILD_TRIX = ./buildTrix
 HIVE_TRIX = /hive/data/inside/trix
 DATA_TRIX = /data/trix
 ALPHA_MACHINE = hgwdev.gi.ucsc.edu
 BETA_MACHINE = qateam@hgwbeta.soe.ucsc.edu
 
+# For the new demo-$USER machines, the "USER" passed in to makefile contains a hyphen which
+# needs to be replaced with an underscore for mysql table names.
+USERTABLE = $(shell echo ${USER} | sed -e 's/-/_/g')
+
 update: ${DBS:%=%_update}
 	${MKDIR} ${CGI_BIN}-${USER}/encode
 %_update:
-	./loadTracks ${EXTRA} trackDb_${USER} hgFindSpec_${USER} $*
-	./checkMetaDb alpha metaDb_${USER} $*
+	./loadTracks ${EXTRA} trackDb_${USERTABLE} hgFindSpec_${USERTABLE} $*
+	./checkMetaDb alpha metaDb_${USERTABLE} $*
 
 #  if you want to test track search tool with your own trix file
-#	rm -f ${DBS:%=${HIVE_TRIX}/%_trackDb_${USER}.{ixx,ix}}
-#	HGDB_TRACKDB=trackDb_${USER} ${BUILD_TRIX} trackDb_${USER} metaDb_${USER} ${CGI_BIN}-${USER}/encode/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} ${DBS}
+#	rm -f ${DBS:%=${HIVE_TRIX}/%_trackDb_${USERTABLE}.{ixx,ix}}
+#	HGDB_TRACKDB=trackDb_${USERTABLE} ${BUILD_TRIX} trackDb_${USERTABLE} metaDb_${USERTABLE} ${CGI_BIN}-${USER}/encode/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} ${DBS}
 # you'll also need to set browser.trixPath to point to your trix file
 # see kent/src/product/ex.hg/conf for details
 
 alpha: clean
 	${GIT} pull
 	${MKDIR} ${CGI_BIN}/encode
 	${MAKE} alpha_all
 
 alpha_all: ${DBS:%=%_alpha}
 
 %_alpha:
 	./loadTracks ${EXTRA} -release=alpha trackDb hgFindSpec $*
 	./checkMetaDb alpha metaDb $*
 	rm -f ${HIVE_TRIX}/$*_trackDb.{ixx,ix}}
 	HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/alpha/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} $*