From cf59220edc7cafc2f95d05696f24ef53ec245ea6 Mon Sep 17 00:00:00 2001 From: Justin S <3630356+codeandkey@users.noreply.github.com> Date: Fri, 1 May 2020 20:50:13 -0500 Subject: stata: add version 16 (#16425) --- var/spack/repos/builtin/packages/stata/package.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stata/package.py b/var/spack/repos/builtin/packages/stata/package.py index 59dee6cf13..6a34f8b593 100644 --- a/var/spack/repos/builtin/packages/stata/package.py +++ b/var/spack/repos/builtin/packages/stata/package.py @@ -27,6 +27,7 @@ class Stata(Package): homepage = "https://www.stata.com/" # url = "stata" + version('16', 'a13a6a92558eeb3c6cb3013c458a6777e54c21af43599df6b0a924f5f5c2d5d2') version('15', '2486f4c7db1e7b453004c7bd3f8da40ba1e30be150613065c7b82b1915259016') # V15 depends on libpng v12 and fails with other versions of libpng @@ -81,6 +82,11 @@ class Stata(Package): bash = which('bash') tar = which('tar') + res_dir = 'unix/linux64/' + + if self.spec.satisfies('@16:'): + res_dir = 'unix/linux64p/' + # Step 1. x = datetime.now() with open("installed.150", "w") as fh: @@ -89,11 +95,11 @@ class Stata(Package): # Step 2. instlist = ['ado.taz', 'base.taz', 'bins.taz', 'docs.taz'] for instfile in instlist: - tar('-x', '-z', '-f', 'unix/linux64/' + instfile) + tar('-x', '-z', '-f', res_dir + instfile) # Step 3. - install('unix/linux64/setrwxp', 'setrwxp') - install('unix/linux64/inst2', 'inst2') + install(res_dir + 'setrwxp', 'setrwxp') + install(res_dir + 'inst2', 'inst2') # Step 4. Since the install script calls out specific permissions and # could change in the future (or old versions) I thought it best to -- cgit v1.2.3-70-g09d2