Update 2 files

- /home/dot_local/bin/executable_install-program
- /home/private_dot_config/shell/exports.sh.tmpl
This commit is contained in:
Brian Zalewski 2022-12-25 12:07:02 +00:00
parent d6543ae46a
commit 26ccc9d149
2 changed files with 13 additions and 8 deletions

View file

@ -736,7 +736,7 @@ async function ensurePackageManager(packageManager) {
) )
} else if (packageManager === 'brew' || packageManager === 'cask') { } else if (packageManager === 'brew' || packageManager === 'cask') {
const brew = which.sync('brew', { nothrow: true }) const brew = which.sync('brew', { nothrow: true })
if (!brew && false) { if (!brew) {
await ensureInstalled( await ensureInstalled(
'brew', 'brew',
$` $`
@ -762,12 +762,16 @@ async function ensurePackageManager(packageManager) {
) )
} }
} else if (packageManager === 'cargo') { } else if (packageManager === 'cargo') {
await ensureInstalled( const cargo = which.sync('cargo', { nothrow: true })
'cargo', if (!cargo) {
$` if (osType === 'darwin') {
# TODO Bash script that installs cargo await $`brew install rustup`
` await $`rustup-init`
) } else if (osType === 'windows') {
} else {
await ensurePackage('cargo')
}
}
} else if (packageManager === 'choco') { } else if (packageManager === 'choco') {
await ensureInstalled( await ensureInstalled(
'choco', 'choco',

View file

@ -119,9 +119,10 @@ export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine" export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine"
### Dotnet ### Dotnet
# TODO - Add DOTNET_ROOT for Linuxbrew
if [ -d /Applications ] && [ -d /Library ]; then if [ -d /Applications ] && [ -d /Library ]; then
export DOTNET_ROOT="/usr/local/opt/dotnet/libexec" export DOTNET_ROOT="/usr/local/opt/dotnet/libexec"
elif [ -d /home/linuxbrew/.linuxbrew/opt/dotnet ]; then
export DOTNET_ROOT="/home/linuxbrew/.linuxbrew/opt/dotnet/libexec"
fi fi
### Elastic Agent ### Elastic Agent