15b99aa056852e31fb0bd7c1f09c9979aab579d7 hiram Fri Jan 6 10:51:46 2017 -0800 eliminate problem echo statements that are not the same in all environments no redmine diff --git src/userApps/Makefile src/userApps/Makefile index 080ec50..501638f 100644 --- src/userApps/Makefile +++ src/userApps/Makefile @@ -18,47 +18,45 @@ utils: libs cd kent/src && ${MAKE} userApps cd kent/src/parasol && ${MAKE} ./kent/src/utils/userApps/mkREADME.sh ${DESTDIR}/${BINDIR} ${CURDIR}/kentUtils.Documentation.txt libs: installEnvironment cd kent/src && ${MAKE} libs clean: test ! -d kent/src || (cd kent/src && ${MAKE} -i -k clean) rm -f part1Src.zip part2Src.zip part3Src.zip part4Src.zip part5Src.zip rm -f userApps.zip fetchSource: ./fetchKentSource.sh - @echo -n "size of fetched kent source tree: " + @printf "size of fetched kent source tree: " @du -hs kent - @echo -n "number of files in kent source tree: " + @printf "number of files in kent source tree: " @find ./kent -type f | wc -l # this installEnvironment will add all the shell environment variables # to the kent/src/inc/localEnvironment.mk file which is included # from the kent/src/inc/userApps.mk to allow any 'make' to function -# properly when inside this extracted source tree. The 'sed' operation -# removes the '-e' from the echo for systems where the echo command doesn't -# recognize the '-e' argument +# properly when inside this extracted source tree. installEnvironment: @test -d kent/src/inc || (echo "ERROR: source has not been fetched yet, try 'make fetchSource' first."; exit 255) - @echo -e "export DESTDIR = ${DESTDIR}\n\ + @printf "export DESTDIR = ${DESTDIR}\n\ export BINDIR = ${BINDIR}\n\ export MACHTYPE = ${MACHTYPE}\n\ export CGI_BIN = ${CGI_BIN}\n\ export DOCUMENTROOT = ${DOCUMENTROOT}\n\ export SCRIPTS = ${SCRIPTS}\n\ export USE_SSL = 1\n\ -export NOSQLTEST = 1" | sed -e 's/-e //' > kent/src/inc/localEnvironment.mk +export NOSQLTEST = 1\n" > kent/src/inc/localEnvironment.mk update: clean userApps ${MAKE} fetchSource ${MAKE} utils userApps: git archive --format=zip -9 \ --remote=git://genome-source.cse.ucsc.edu/kent.git \ HEAD src/userApps > userApps.zip unzip -q -o -d . -j userApps.zip