Switched ansible-core to ansible
This commit is contained in:
parent
86042c0fe9
commit
b25f452d8c
4 changed files with 12 additions and 12 deletions
|
@ -933,13 +933,13 @@ symlinkAnsibleRoles() {
|
|||
pipx ensurepath
|
||||
fi
|
||||
logg info 'Installing ansible-core via pipx'
|
||||
pipx install ansible-core
|
||||
pipx install ansible
|
||||
if [ -d /Applications ] && [ -d /System ]; then
|
||||
logg info 'Injecting macOS-specific pipx dependencies via pipx'
|
||||
pipx inject ansible-core PyObjC PyObjC-core
|
||||
pipx inject ansible PyObjC PyObjC-core
|
||||
fi
|
||||
logg info 'Injecting Ansible dependencies via pipx'
|
||||
pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
|
||||
pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
|
||||
mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/megabyte-labs"
|
||||
touch "${XDG_CACHE_HOME:-$HOME/.cache}/megabyte-labs/ansible-installed"
|
||||
fi
|
||||
|
|
|
@ -643,11 +643,11 @@ showNotificationCenter() {
|
|||
installAnsible() {
|
||||
if command -v pipx > /dev/null; then
|
||||
if [ ! -f "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor/ansible-installed" ]; then
|
||||
logg info 'Running pipx install ansible-core' && pipx install ansible-core
|
||||
logg info 'Running pipx install ansible' && pipx install ansible
|
||||
if [ -d /Applications ] && [ -d /System ]; then
|
||||
logg info 'Injecting ansible-core pipx with ansible-core PyObjC PyObjC-core because system is macOS' && pipx inject ansible-core PyObjC PyObjC-core
|
||||
logg info 'Injecting ansible pipx with ansible PyObjC PyObjC-core because system is macOS' && pipx inject ansible PyObjC PyObjC-core
|
||||
fi
|
||||
logg info 'Running pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog' && pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
|
||||
logg info 'Running pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog' && pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
|
||||
mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor"
|
||||
touch "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor/ansible-installed"
|
||||
else
|
||||
|
|
|
@ -874,11 +874,11 @@ async function ensureInstalled(bin, callback) {
|
|||
}
|
||||
|
||||
async function ensurePackageManagerAnsible() {
|
||||
await $`pipx install ansible-core`
|
||||
await $`pipx install ansible`
|
||||
if (osType === 'darwin') {
|
||||
await $`pipx inject ansible-core PyObjC PyObjC-core`
|
||||
await $`pipx inject ansible PyObjC PyObjC-core`
|
||||
}
|
||||
await $`pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
|
||||
await $`pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
|
||||
await $`mkdir -p "$HOME/.cache/megabyte-labs"`
|
||||
await $`touch "$HOME/.cache/megabyte-labs/ansible-installed"`
|
||||
log('info', 'Package Manager Install', `Ansible and its supporting packages are now installed via pipx`)
|
||||
|
|
|
@ -747,11 +747,11 @@ async function ensureInstalled(bin, callback) {
|
|||
}*/
|
||||
/*
|
||||
async function ensurePackageManagerAnsible() {
|
||||
await $`pipx install ansible-core`
|
||||
await $`pipx install ansible`
|
||||
if (osType === 'darwin') {
|
||||
await $`pipx inject ansible-core PyObjC PyObjC-core`
|
||||
await $`pipx inject ansible PyObjC PyObjC-core`
|
||||
}
|
||||
await $`pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
|
||||
await $`pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
|
||||
await $`mkdir -p "$HOME/.cache/megabyte-labs"`
|
||||
await $`touch "$HOME/.cache/megabyte-labs/ansible-installed"`
|
||||
log('info', 'Package Manager Install', `Ansible and its supporting packages are now installed via pipx`)
|
||||
|
|
Loading…
Reference in a new issue