punkfairie/install.fairie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 2 files

Browse source 
- /home/dot_local/bin/executable_provision.tmpl
- /local/provision.sh
This commit is contained in:
Brian Zalewski 2022-12-25 08:08:21 +00:00
parent 619a10a783
commit 5e9faa499d
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
home/dot_local/bin/executable_provision.tmpl
View file

@ -90,13 +90,13 @@ if command -v qubesctl > /dev/null; then
fi
### 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
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
if command -v apt-get > /dev/null; then
# Debian / Ubuntu
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
# Fedora
sudo dnf install -y curl git
@ -140,9 +140,17 @@ ensurePackageManagerHomebrew() {
logg info 'Installing Homebrew'
if command -v sudo > /dev/null && sudo -n true; then
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
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="$?"
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 command -v brew > /dev/null; then
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 node
installBrewPackage zx
else
logg error 'Homebrew is not available in the PATH' && exit 1
fi
### Ensure source files are present

12
local/provision.sh
View file

@ -256,13 +256,13 @@ if command -v qubesctl > /dev/null; then
fi
### 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
logg info 'Ensuring `curl` and `git` are installed via the system package manager'
if command -v apt-get > /dev/null; then
# Debian / Ubuntu
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
# Fedora
sudo dnf install -y curl git
@ -306,9 +306,17 @@ ensurePackageManagerHomebrew() {
logg info 'Installing Homebrew'
if command -v sudo > /dev/null && sudo -n true; then
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
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="$?"
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 command -v brew > /dev/null; then
logg warn 'Homebrew was installed but part of the installation failed. Attempting to fix..'