mirror of
https://github.com/ivabus/pantry
synced 2024-11-26 18:25:08 +03:00
fixes for teaxyz/cli@0.8.0
This commit is contained in:
parent
fd3fff333b
commit
8d85b5db8e
2 changed files with 5 additions and 5 deletions
|
@ -65,10 +65,10 @@ async function __build(pkg: Package) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function mkenv() {
|
function mkenv() {
|
||||||
const env = useShellEnv(resolved)
|
const env = useShellEnv({ installations: resolved})
|
||||||
|
|
||||||
if (platform == 'darwin') {
|
if (platform == 'darwin') {
|
||||||
env.vars['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
|
env['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
|
||||||
}
|
}
|
||||||
|
|
||||||
return env
|
return env
|
||||||
|
@ -86,7 +86,7 @@ async function __build(pkg: Package) {
|
||||||
cd "${src}"
|
cd "${src}"
|
||||||
|
|
||||||
export SRCROOT="${src}"
|
export SRCROOT="${src}"
|
||||||
${expand(env.vars)}
|
${expand(env)}
|
||||||
|
|
||||||
${/*FIXME hardcoded paths*/ ''}
|
${/*FIXME hardcoded paths*/ ''}
|
||||||
export PATH=/opt/tea.xyz/var/pantry/scripts/brewkit:"$PATH"
|
export PATH=/opt/tea.xyz/var/pantry/scripts/brewkit:"$PATH"
|
||||||
|
|
|
@ -32,7 +32,7 @@ async function test(self: Installation) {
|
||||||
const yml = await pantry.getYAML(self.pkg).parse()
|
const yml = await pantry.getYAML(self.pkg).parse()
|
||||||
const deps = await deps4(self.pkg)
|
const deps = await deps4(self.pkg)
|
||||||
const installations = await prepare(deps)
|
const installations = await prepare(deps)
|
||||||
const env = useShellEnv([self, ...installations])
|
const env = useShellEnv({ installations: [self, ...installations] })
|
||||||
|
|
||||||
let text = undent`
|
let text = undent`
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
@ -41,7 +41,7 @@ async function test(self: Installation) {
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
${expand(env.vars)}
|
${expand(env)}
|
||||||
|
|
||||||
`
|
`
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue