diff --git a/makefile b/makefile index 32f33d1..176032f 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,8 @@ EXPORTDIR = /shared INSTALLDIR = /opt/TundraWare TOOLS = tools -MYTOOLS = perl python emacs joe htop nload nmap screen the_silver_searcher tree vim +LANGS = perl python +MYTOOLS = emacs joe htop nload nmap screen the_silver_searcher tree vim PIPMODULES = ansible pew pew[pythonz] # Nothing below here should need changing @@ -31,10 +32,11 @@ full-build: echo "Make sure your OS autoconf, automake, and perl are installed!" echo 'Make sure the bootstrap is installed at $TOOLSDIR' - ${BREW} install ${MYTOOLS} + ${BREW} install ${LANGS} ln -nfs ${INSTALLDIR}/${TOOLS}/bin/python2 ${INSTALLDIR}/${TOOLS}/bin/python ln -nfs ${INSTALLDIR}/${TOOLS}/bin/pip2 ${INSTALLDIR}/${TOOLS}/bin/pip - pip install $PIPMODULES -U --ignore-installed + pip install ${PIPMODULES} -U --ignore-installed + ${BREW} install ${MYTOOLS} full-release: tidyup cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-${DATESTAMP}