Update 2 files
- /home/dot_local/bin/executable_provision.tmpl - /local/provision.sh
This commit is contained in:
parent
619a10a783
commit
5e9faa499d
2 changed files with 22 additions and 4 deletions
|
@ -90,13 +90,13 @@ if command -v qubesctl > /dev/null; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### System package manager update / Homebrew dependencies
|
### System package manager update / Homebrew dependencies
|
||||||
if ! command -v curl > /dev/null || ! command -v git > /dev/null; then
|
if ! command -v curl > /dev/null || ! command -v git > /dev/null || ! command -v brew > /dev/null; then
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
|
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
|
||||||
if command -v apt-get > /dev/null; then
|
if command -v apt-get > /dev/null; then
|
||||||
# Debian / Ubuntu
|
# Debian / Ubuntu
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y curl git
|
sudo apt-get install -y build-essential curl git
|
||||||
elif command -v dnf > /dev/null; then
|
elif command -v dnf > /dev/null; then
|
||||||
# Fedora
|
# Fedora
|
||||||
sudo dnf install -y curl git
|
sudo dnf install -y curl git
|
||||||
|
@ -140,9 +140,17 @@ ensurePackageManagerHomebrew() {
|
||||||
logg info 'Installing Homebrew'
|
logg info 'Installing Homebrew'
|
||||||
if command -v sudo > /dev/null && sudo -n true; then
|
if command -v sudo > /dev/null && sudo -n true; then
|
||||||
echo | bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
echo | bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||||
|
if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
brew install gcc
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
logg info 'Looks like the user does not have passwordless sudo privileges. A sudo password may be required.'
|
logg info 'Looks like the user does not have passwordless sudo privileges. A sudo password may be required.'
|
||||||
bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" || BREW_EXIT_CODE="$?"
|
bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" || BREW_EXIT_CODE="$?"
|
||||||
|
if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
brew install gcc
|
||||||
|
fi
|
||||||
if [ -n "$BREW_EXIT_CODE" ]; then
|
if [ -n "$BREW_EXIT_CODE" ]; then
|
||||||
if command -v brew > /dev/null; then
|
if command -v brew > /dev/null; then
|
||||||
logg warn 'Homebrew was installed but part of the installation failed. Attempting to fix..'
|
logg warn 'Homebrew was installed but part of the installation failed. Attempting to fix..'
|
||||||
|
@ -173,6 +181,8 @@ if command -v brew > /dev/null; then
|
||||||
installBrewPackage gum
|
installBrewPackage gum
|
||||||
installBrewPackage node
|
installBrewPackage node
|
||||||
installBrewPackage zx
|
installBrewPackage zx
|
||||||
|
else
|
||||||
|
logg error 'Homebrew is not available in the PATH' && exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Ensure source files are present
|
### Ensure source files are present
|
||||||
|
|
|
@ -256,13 +256,13 @@ if command -v qubesctl > /dev/null; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### System package manager update / Homebrew dependencies
|
### System package manager update / Homebrew dependencies
|
||||||
if ! command -v curl > /dev/null || ! command -v git > /dev/null; then
|
if ! command -v curl > /dev/null || ! command -v git > /dev/null || ! command -v brew > /dev/null; then
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
|
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
|
||||||
if command -v apt-get > /dev/null; then
|
if command -v apt-get > /dev/null; then
|
||||||
# Debian / Ubuntu
|
# Debian / Ubuntu
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y curl git
|
sudo apt-get install -y build-essential curl git
|
||||||
elif command -v dnf > /dev/null; then
|
elif command -v dnf > /dev/null; then
|
||||||
# Fedora
|
# Fedora
|
||||||
sudo dnf install -y curl git
|
sudo dnf install -y curl git
|
||||||
|
@ -306,9 +306,17 @@ ensurePackageManagerHomebrew() {
|
||||||
logg info 'Installing Homebrew'
|
logg info 'Installing Homebrew'
|
||||||
if command -v sudo > /dev/null && sudo -n true; then
|
if command -v sudo > /dev/null && sudo -n true; then
|
||||||
echo | bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
echo | bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||||
|
if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
brew install gcc
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
logg info 'Looks like the user does not have passwordless sudo privileges. A sudo password may be required.'
|
logg info 'Looks like the user does not have passwordless sudo privileges. A sudo password may be required.'
|
||||||
bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" || BREW_EXIT_CODE="$?"
|
bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" || BREW_EXIT_CODE="$?"
|
||||||
|
if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
brew install gcc
|
||||||
|
fi
|
||||||
if [ -n "$BREW_EXIT_CODE" ]; then
|
if [ -n "$BREW_EXIT_CODE" ]; then
|
||||||
if command -v brew > /dev/null; then
|
if command -v brew > /dev/null; then
|
||||||
logg warn 'Homebrew was installed but part of the installation failed. Attempting to fix..'
|
logg warn 'Homebrew was installed but part of the installation failed. Attempting to fix..'
|
||||||
|
|
Loading…
Reference in a new issue