Fix Linux dnf install

This is intended to install a MVP development environment on machines
where no root access is granted.

README.md

@@ -4,18 +4,24 @@ Bootstrap an OS instance with bare essentials.
 
 ## Usage
 
+To bootstrap a Linux instance choose one of:
+
+```bash
+wget https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Linux.sh && chmod +x bootstrap-Linux.sh && ./bootstrap-Linux.sh
+```
+
+```bash
+curl -O https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Linux.sh && chmod +x bootstrap-Linux.sh && ./bootstrap-Linux.sh
+```
+
+To bootstrap a Windows instance:
+
+```powershell
+Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-WebRequest -Uri "https://git.infektor.net/config/bootstrap/raw/main/bootstrap-Windows.ps1" -OutFile "./bootstrap-Windows.ps1"; ./bootstrap-Windows.ps1
+```
+
 To bootstrap a macOS instance:
 
-```
+```bash
-$ curl -s https://code.infektor.net/config/bootstrap/raw/master/bootstrap-macOS.sh | sh
+curl -O https://git.infektor.net/config/bootstrap/raw/main/bootstrap-macOS.sh && chmod +x bootstrap-macOS.sh && ./bootstrap-macOS.sh
-```
-
-## Package
-
-Install as a pip package to set SSH keys on any of GitHub, GitLab, BitBucket
-Cloud, or Gogs servers:
-
-```
-pip install git+https://code.infektor.net/config/bootstrap.git
-python -c 'import bootstrap; bootstrap.set_ssh_keys()'
 ```

bootstrap-Linux-rootless.sh

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+error() {
+  echo "$1 not found" >&2
+  exit 1
+}
+
+download() {
+  local url=$1
+  local output=$2
+  if command -v curl &> /dev/null; then
+    curl -o $output --location $url
+  elif command -v wget &> /dev/null; then
+    wget -O $output $url
+  else
+    error "curl/wget not found"
+  fi
+}
+
+download https://git.infektor.net/config/local/raw/branch/main/roles/bash/templates/bashrc ~/.bashrc
+download https://git.infektor.net/config/local/raw/branch/main/roles/readline/templates/inputrc ~/.inputrc
+
+if ! command -v git &> /dev/null; then
+  error "git not found"
+fi
+
+git-clone-or-pull() {
+  local repo=$1
+  local dir=$2
+  if [ -d $dir ]; then
+    git -C $dir pull
+  else
+    git clone $repo $dir
+  fi
+}
+
+git-clone-or-pull https://git.infektor.net/config/nvim.git ~/.config/nvim
+# TODO: install nvim
+
+git-clone-or-pull https://git.infektor.net/config/zsh.git ~/.config/zsh
+# TODO: build & install zsh
+if command -v zsh &> /dev/null; then
+  zsh ~/.config/zsh/install.zsh
+fi
+
+git-clone-or-pull https://git.infektor.net/config/tmux.git ~/.config/tmux
+~/.config/tmux/install.sh
+
+mkdir -p ~/.local/bin
+mkdir -p ~/.local/share/man/man1
+mkdir -p ~/.local/share/zsh/site-functions
+
+if ! command -v rg &> /dev/null; then
+  mkdir -p ~/.cache/tmp
+  pushd ~/.cache/tmp
+
+  download https://github.com/BurntSushi/ripgrep/releases/download/14.1.1/ripgrep-14.1.1-x86_64-unknown-linux-musl.tar.gz rg.tar.gz
+  tar zxf rg.tar.gz --strip-components=1 --no-same-owner
+  mv rg ~/.local/bin
+  mv doc/rg.1 ~/.local/share/man/man1/rg.1
+  mv complete/_rg ~/.local/share/zsh/site-functions
+
+  popd
+  rm -r ~/.cache/tmp
+fi
+
+if ! command -v fzf &> /dev/null; then
+  mkdir -p ~/.cache/tmp
+  pushd ~/.cache/tmp
+
+  download https://github.com/junegunn/fzf/releases/download/v0.64.0/fzf-0.64.0-linux_amd64.tar.gz fzf.tar.gz
+  tar zxf fzf.tar.gz
+  mv fzf ~/.local/bin
+
+  popd
+  rm -r ~/.cache/tmp
+fi
+
+if ! command -v bat &> /dev/null; then
+  mkdir -p ~/.cache/tmp
+  pushd ~/.cache/tmp
+
+  download https://github.com/sharkdp/bat/releases/download/v0.25.0/bat-v0.25.0-x86_64-unknown-linux-musl.tar.gz bat.tar.gz
+  tar zxf bat.tar.gz --strip-components=1 --no-same-owner
+  mv bat ~/.local/bin
+  mv bat.1 ~/.local/share/man/man1
+  mv autocomplete/bat.zsh ~/.local/share/zsh/site-functions/_bat
+
+  popd
+  rm -r ~/.cache/tmp
+fi

bootstrap-Linux.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e
+
+show_usage() {
+  echo "usage: $0 [-h] [-y]"
+}
+
+show_help() {
+  show_usage
+  echo
+  echo "Bootstrap Fedora or Debian-based Linux distribution with:"
+  echo
+  echo "* Update packages"
+  echo "* Install git, python3-pip"
+  echo "* Install ansible"
+  echo "* Clone configuration repository"
+  echo "* Install 1password"
+  echo
+  echo "If any already exist they will not be reinstalled."
+  echo
+  echo "optional arguments:"
+  echo "        -h              show this help message and exit"
+  echo "        -y              assume yes when prompted"
+}
+
+yes=0
+
+while getopts 'hy' opt; do
+  case $opt in
+    h) show_help; exit 0 ;;
+    y) yes=1 ;;
+    *) show_usage; exit 1 ;;
+  esac
+done
+
+agree() {
+  local check=^[Nn]$
+  [ $yes -eq 1 ] && [[ ! "$2" =~ $check ]] && return 0
+  [[ "$2" =~ $check ]] && local default="[y/N]" || local default="[Y/n]"
+  read -p "$1 $default? " answer
+  case "$answer" in
+    y|Y|yes) return 0 ;;
+    n|N|no) return 1 ;;
+    '') [[ "$2" =~ $check ]] && return 1 || return 0 ;;
+    *) echo "invalid input: $answer" && return `agree "$1"` ;;
+  esac
+}
+
+if command -v apt &> /dev/null; then
+  agree "Update apt cache" && sudo apt-get update
+  agree "Upgrade apt packages" "N" && sudo apt-get upgrade
+  echo "Install git python3-pip"
+  sudo apt-get install --yes git python3-pip
+fi
+
+if command -v dnf &> /dev/null; then
+  agree "Upgrade dnf packages" "N" && sudo dnf upgrade
+  echo "Install git python3-pip"
+  sudo dnf install --assumeyes git python3-pip python3-libdnf5
+fi
+
+echo "Install ansible"
+pip install --user --break-system-packages ansible jmespath
+
+if [ ! -d ~/.config/local ]; then
+  echo "Clone configuration repository"
+  git clone https://git.infektor.net/config/local.git ~/.config/local
+fi
+
+if agree "Install 1password"; then
+  pushd ~/.config/local
+  ~/.local/bin/ansible-playbook ~/.config/local/playbooks/1password.yaml
+  popd
+fi
+
+[ -f $0 ] && agree "Remove $0" "N" && rm $0 || exit 0

bootstrap-Windows.ps1

@@ -0,0 +1,62 @@
+$IsElevated = [bool]([Security.Principal.WindowsPrincipal] `
+  [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")
+$Choices = '&Yes', '&No'
+
+if (-Not $IsElevated) {
+  Write-Host "Not running as Administrator. Performing unprivileged actions."
+
+  # Install Scoop
+  Write-Host "`nInstall Scoop"
+  $ScoopInstaller = "$env:USERPROFILE/Downloads/ScoopInstaller.ps1"
+  Invoke-WebRequest -Uri https://get.scoop.sh -OutFile $ScoopInstaller
+  &$ScoopInstaller -ScoopDir "$env:LocalAppData/Scoop" -ScoopGlobalDir "$env:ProgramData/Scoop"
+
+  $Bootstrap = $MyInvocation.MyCommand.Path
+  $Decision = $Host.UI.PromptForChoice('Relaunch as Administrator', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    Start-Process powershell.exe "-ExecutionPolicy ByPass -NoProfile -File $Bootstrap" -Verb RunAs
+  }
+
+  $Decision = $Host.UI.PromptForChoice("Remove $Bootstrap", "Proceed?", $Choices, 1)
+  if ($Decision -eq 0) {
+    Remove-Item $Bootstrap -Force
+  }
+} else {
+  Write-Host "Running as Administrator. Performing privileged actions."
+
+  # Install 1Password
+  $Decision = $Host.UI.PromptForChoice('Install 1Password', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    $1passwordInstaller = "$env:USERPROFILE/Downloads/1PasswordSetup-latest.exe"
+    Invoke-WebRequest -Uri "https://downloads.1password.com/win/1PasswordSetup-latest.exe" -OutFile "$1passwordInstaller"
+    &$1passwordInstaller
+    Remove-Item $1passwordInstaller
+  }
+
+  # Enable Hyper-V
+  $Decision = $Host.UI.PromptForChoice('Enable Hyper-V', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+  }
+
+  # Enable Containters
+  $Decision = $Host.UI.PromptForChoice('Enable Containers', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    Enable-WindowsOptionalFeature -Online -FeatureName Containers -All
+  }
+
+  # Install Chocolatey
+  Write-Host "`nInstall Chocolatey"
+  iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+  # Install SSH Server
+  $Decision = $Host.UI.PromptForChoice('Install SSH Server', 'Proceed?', $Choices, 0)
+  if ($Decision -eq 0) {
+    choco install --yes "--package-parameters=/SSHServerFeature" openssh
+    Start-Service sshd
+    Set-Service -Name sshd -StartupType 'Automatic'
+  }
+
+  Write-Host 'Press any key to continue...'
+  [System.Console]::ReadKey($true)
+}

bootstrap-macOS.sh

@@ -11,16 +11,13 @@ show_help() {
   echo
   echo "Bootstrap a macOS instance with:"
   echo
-  echo "* Xcode command line developer tools"
+  echo "* Install xcode command line developer tools"
-  echo "* Homebrew - package manager"
+  echo "* Install homebrew"
-  echo "* python - from Homebrew"
+  echo "* Update packages"
-  echo "* virtualenv - from pip"
+  echo "* Install python, pip"
-  echo "* SSH key - from ssh-keygen"
+  echo "* Install ansible"
-  echo "* GitHub public key - with SSH key"
+  echo "* Clone configuration repository"
-  echo "* GitLab public key - with SSH key"
+  echo "* Install 1password"
-  echo "* BitBucket Cloud public key - with SSH key"
-  echo "* Gogs Cloud public key - with SSH key"
-  echo "* conduit - configuration manager"
   echo
   echo "If any already exist they will not be reinstalled."
   echo
@@ -56,14 +53,6 @@ agree() {
   esac
 }
 
-brew_install() {
-  brew install $1 > /dev/null
-}
-
-pip_install() {
-  pip install --user $1 > /dev/null
-}
-
 export PATH=~/.local/bin:$PATH
 export PYTHONUSERBASE=~/.local
 
@@ -71,40 +60,23 @@ if ! xcode-select --print-path &> /dev/null; then
   agree "Install Xcode command line developer tools" && xcode-select --install
 fi
 
-missing brew && agree "Intalll Homebrew" && /usr/bin/ruby -e \
+missing brew && agree "Install homebrew" && /usr/bin/ruby -e \
   "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-agree "Update Homebrew packages" && brew update > /dev/null
+agree "Update homebrew packages" && brew update
+brew install python
 
-if missing /usr/local/bin/python2 && agree "Install Homebrew python"; then
+# TODO: Update PATH for pip?
-  brew_install python
+
-  export PATH=/usr/local/opt/python/libexec/bin:$PATH
+echo "Install ansible"
-  echo "To use Homebrew python update your PATH:"
+pip install --user --break-system-packages ansible jmespath
-  echo 'export PATH=/usr/local/opt/python/libexec/bin:$PATH'
+
+if [ ! -d ~/.config/local ]; then
+  echo "Clone configuration repository"
+  git clone https://git.infektor.net/config/local.git ~/.config/local
 fi
 
-missing virtualenv && agree "Install virtualenv" && pip_install virtualenv
+agree "Install 1password" && \
-
+  ~/.local/bin/ansible-playbook ~/.config/local/playbooks/1password.yaml
-if [ ! -f ~/.ssh/id_rsa ] && agree "Generate SSH key"; then
-  read -rp "SSH email: " email
-  [ ! -d ~/.ssh ] && mkdir -p ~/.ssh
-  ssh-keygen -t rsa -b 4096 -C "$email" -N "" -f ~/.ssh/id_rsa
-fi
-
-if ! missing virtualenv && agree "Set SSH keys on remote Git servers"; then
-  env=$(mktemp -d)
-  virtualenv $env &> /dev/null
-  source $env/bin/activate
-  pip install git+https://code.infektor.net/config/bootstrap.git > /dev/null
-  python -c 'import bootstrap; bootstrap.set_ssh_keys()'
-  deactivate
-  rm -r $env
-fi
-
-! missing pip && missing conduit && agree "Install conduit" && \
-  pip_install git+ssh://git@github.com/kbenzie/conduit.git
-
-echo "To use installed pip packages update your PATH and PYTHONUSERBASE:"
-echo 'export PATH=~/.local/bin:$PATH && export PYTHONUSERBASE=~/.local'
 
 [ -f $0 ] && agree "Remove $0" "N" && rm $0 || exit 0

bootstrap/__init__.py

@@ -1,185 +0,0 @@
-"""Interactively set SSH keys on remote Git servers."""
-
-from __future__ import print_function
-from getpass import getpass
-from os import environ
-from os.path import join
-from platform import node, system
-
-from requests import ConnectionError, get, post
-from requests.auth import HTTPBasicAuth
-from requests.compat import urlparse
-
-try:
-    input = raw_input
-except NameError:
-    pass
-
-
-class BootstrapError(Exception):
-    """Bootstrap Exception."""
-    pass
-
-
-def bootstrap_error(response):
-    """Create a BootstrapError from a Response."""
-    return BootstrapError('%s %s' % (response.status_code, response.reason))
-
-
-def agree(question, default='Y'):
-    """Prompt user to answer a yes/no question."""
-    valid = {
-        'y': True,
-        'Y': True,
-        'yes': True,
-        'n': False,
-        'N': False,
-        'no': False,
-        '': {'Y': True,
-             'N': False}[default]
-    }
-    answer = input('%s [%s]? ' % (question, {'Y': 'Y/n', 'N': 'y/N'}[default]))
-    try:
-        return valid[answer]
-    except KeyError:
-        print('invalid input: %s' % answer)
-        return agree(question)
-
-
-def get_url(service, default):
-    """Get URL."""
-    url = input('%s URL%s: ' % (service, ' (%s)' % default if default else ''))
-    if url == '':
-        if default:
-            return default
-        else:
-            print('invalid input: %s' % url)
-            return get_url(service, default)
-    return url
-
-
-def get_username_password(service):
-    """Get username/password."""
-    username = input('%s username: ' % service)
-    password = getpass('%s password: ' % service)
-    return (username, password)
-
-
-def get_local_key():
-    """Get local SSH key."""
-    if system() == 'Windows':
-        home = environ['userprofile']
-    else:
-        home = environ['HOME']
-    with open(join(home, '.ssh', 'id_rsa.pub'), 'r') as key_file:
-        return key_file.read().rstrip()
-
-
-def key_exists(keys, local_key):
-    """Check if local SSH key is already set."""
-    for key in keys:
-        if local_key.startswith(key['key']):
-            return True
-    return False
-
-
-def set_github_ssh_key():
-    """Set GitHub SSH key."""
-    url = urlparse(get_url('GitHub', 'https://github.com'))
-    keys_url = '%s://api.%s/user/keys' % (url.scheme, url.netloc)
-    username, password = get_username_password('GitHub')
-    auth = HTTPBasicAuth(username, password)
-    response = get(keys_url, auth=auth)
-    if response.status_code != 200:
-        raise bootstrap_error(response)
-    keys = response.json()
-    local_key = get_local_key()
-    if not key_exists(keys, local_key):
-        response = post(
-            keys_url, auth=auth, json={'title': node(),
-                                       'key': local_key})
-        if response.status_code != 201:
-            raise bootstrap_error(response)
-
-
-def set_gitlab_ssh_key():
-    """Set GitLab SSH key."""
-    api_url = '%s/api/v4' % get_url('GitLab', 'https://gitlab.com')
-    session_url = '%s/session' % api_url
-    keys_url = '%s/user/keys' % api_url
-    username, password = get_username_password('GitLab')
-    response = post(session_url, {'login': username, 'password': password})
-    if response.status_code != 201:
-        raise bootstrap_error(response)
-    auth = {'Private-Token': response.json()['private_token']}
-    response = get(keys_url, headers=auth)
-    if response.status_code != 200:
-        raise bootstrap_error(response)
-    keys = response.json()
-    local_key = get_local_key()
-    if not key_exists(keys, local_key):
-        response = post(
-            keys_url, headers=auth, json={'title': node(),
-                                          'key': local_key})
-        if response.status_code != 201:
-            raise bootstrap_error(response)
-
-
-def set_bitbucket_cloud_ssh_key():
-    """Set BitBucket Cloud SSH key."""
-    username, password = get_username_password('BitBucket Cloud')
-    keys_url = 'https://api.bitbucket.org/1.0/users/%s/ssh-keys' % username
-    auth = HTTPBasicAuth(username, password)
-    response = get(keys_url, auth=auth)
-    if response.status_code != 200:
-        raise bootstrap_error(response)
-    keys = response.json()
-    local_key = get_local_key()
-    if not key_exists(keys, local_key):
-        response = post(
-            keys_url, auth=auth, data={'label': node(),
-                                       'key': local_key})
-        if response.status_code != 200:
-            raise bootstrap_error(response)
-
-
-def set_gogs_ssh_key():
-    """Set Gogs SSH key."""
-    keys_url = '%s/api/v1/user/keys' % get_url('Gogs', None)
-    username, password = get_username_password('Gogs')
-    auth = HTTPBasicAuth(username, password)
-    response = get(keys_url, auth=auth)
-    if response.status_code != 200:
-        raise bootstrap_error(response)
-    keys = response.json()
-    local_key = get_local_key()
-    if not key_exists(keys, local_key):
-        response = post(
-            keys_url, auth=auth, json={'title': node(),
-                                       'key': local_key})
-        if response.status_code != 201:
-            raise bootstrap_error(response)
-
-
-def set_ssh_keys():
-    """Interactively set SSH keys on remote Git servers."""
-    try:
-        for service in ['GitHub', 'GitLab', 'BitBucket Cloud', 'Gogs']:
-            question = 'Set %s SSH key' % service
-            default = 'Y'
-            while agree(question, default):
-                try:
-                    {
-                        'GitHub': set_github_ssh_key,
-                        'GitLab': set_gitlab_ssh_key,
-                        'BitBucket Cloud': set_bitbucket_cloud_ssh_key,
-                        'Gogs': set_gogs_ssh_key,
-                    }[service]()
-                    if service == 'BitBucket Cloud':
-                        break
-                    question = 'Set another %s SSH key' % service
-                    default = 'N'
-                except (BootstrapError, ConnectionError) as error:
-                    print('error: %s' % error.message)
-    except KeyboardInterrupt:
-        exit(130)

setup.py

@@ -1,11 +0,0 @@
-"""Setup bootstrap package."""
-
-from setuptools import find_packages, setup
-
-setup(
-    name='bootstrap',
-    version='0.1.0',
-    packages=find_packages(),
-    install_requires=[
-        'requests',
-    ])