diff --git a/makefile b/makefile index c941a75..c59079e 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,7 @@ LANGS = go perl python # Stuff we want pip to install -PIPMODULES = pip ansible pew pythonz-bd mutagen docutils +PIPMODULES = ansible pew pythonz-bd mutagen docutils # Set of packages we want to include in the distribution tarball MYTOOLS = file-formula gawk gnu-tar htop nload nmap screen socat source-highlight ripgrep tmux tree vim @@ -71,16 +71,15 @@ @echo "Make sure the bootstrap is installed at ${TOOLSDIR}" # sudo yum -y install autoconf automake patch perl texinfo + brew unlink util-linux - brew unlink tcl-tk - brew unlink util-linux ${BREW} install -s --verbose ${LANGS} - ${BREW} link --verbose python + ln -nfs ${TOOLSDIR}/bin/python3 ${TOOLSDIR}/bin/python ln -nfs ${TOOLSDIR}/bin/pip3 ${TOOLSDIR}/bin/pip - pip install ${PIPMODULES} -U --ignore-installed - brew link tcl-tk + pip install ${PIPMODULES} -U --ignore-installed --break-system-packages + brew link util-linux ${BREW} install -s --verbose ${MYTOOLS} ln -nfs ${TOOLSDIR}/bin/vim ${TOOLSDIR}/bin/vi