From 3b05dfecc4e8d20f70a9cbeed858127c0ea3ff48 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 11 Nov 2024 12:37:07 +0100 Subject: [PATCH] indents --- bash/ovh-rescue.sh | 121 +++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/bash/ovh-rescue.sh b/bash/ovh-rescue.sh index aa2f061..fe61576 100644 --- a/bash/ovh-rescue.sh +++ b/bash/ovh-rescue.sh @@ -13,14 +13,14 @@ APT::Install-Suggests False; APT::Get::Show-Versions True; Dir::Etc::SourceParts ''; Dpkg::Progress True; -" > "/etc/apt/apt.conf" +" >"/etc/apt/apt.conf" # apt / sources printf "\ deb https://deb.debian.org/debian buster main contrib non-free deb https://deb.debian.org/debian buster-backports main contrib non-free deb https://deb.debian.org/debian buster-updates main contrib non-free deb https://deb.debian.org/debian-security buster/updates main contrib non-free -" > "/etc/apt/sources.list" +" >"/etc/apt/sources.list" # bash / rc main_link_bashrc # host name @@ -29,7 +29,7 @@ deb https://deb.debian.org/debian-security buster/updates main contrib non-free printf "\ en_US.UTF-8 UTF-8 fr_FR.UTF-8 UTF-8 -" > '/etc/locale.gen' +" >"/etc/locale.gen" # fix alias rm --force "/usr/share/locale/locale.alias" ln --symbolic "/etc/locale.alias" "/usr/share/locale/locale.alias" @@ -41,8 +41,9 @@ fr_FR.UTF-8 UTF-8 debian_disable_frontend # install packages apt-get install --assume-yes \ - "byobu" \ - "mosh" + "mosh" \ + "tmux" \ + "byobu" # apt_clean_cache } @@ -59,55 +60,55 @@ ovh_rescue_install() { apt_clean_cache # install packages apt-get install --assume-yes \ - "parted" "mdadm" "lvm2" \ -\ - "lshw" \ - "file" "micro" \ - "grub-efi-amd64-bin" "grub-pc-bin" \ - "htop" "iotop" "lsof" \ - "exa" "ncdu" "nnn" "ranger" "tree" \ - "squashfs-tools" \ - "uuid-runtime" + "parted" "mdadm" "lvm2" \ + \ + "lshw" \ + "file" "micro" \ + "grub-efi-amd64-bin" "grub-pc-bin" \ + "htop" "iotop" "lsof" \ + "exa" "ncdu" "nnn" "ranger" "tree" \ + "squashfs-tools" \ + "uuid-runtime" # apt_clean_cache # install backports apt-get install --assume-yes \ - --target-release "${release}-backports" \ - "cryptsetup-bin" "rsync" \ -\ - "git" + --target-release "${release}-backports" \ + "cryptsetup-bin" "rsync" \ + \ + "git" # apt_clean_cache } ovh_rescue_upload() { -local host="${1}" -if [ "${host}" ] ; then - local user="root" - # - local user_host="${user}@${host}" - # remove fingerprints - ssh-keygen -R "${host}" - # copy ssh id - ssh-copy-id \ - -o "StrictHostKeyChecking=accept-new" \ - "${user_host}" - # upload root - rsync --delete --recursive "${MAIN_BASH_ROOT}/" "${user_host}:/etc/bash/" - # call setup - # TODO variable - ssh "${user_host}" -- \ - "source \"/etc/bash/main.sh\" ; ovh-rescue-configure \"${host}\"" - # create session - ssh "${user_host}" -- byobu new-session -d - # send keys - ssh "${user_host}" -- byobu send-keys "ovh-rescue-install" "C-m" - # attach session - mosh "${user_host}" -- byobu attach-session -else - echo 'Host?' - return 1 -fi + local host="${1}" + if [ "${host}" ]; then + local user="root" + # + local user_host="${user}@${host}" + # remove fingerprints + ssh-keygen -R "${host}" + # copy ssh id + ssh-copy-id \ + -o "StrictHostKeyChecking=accept-new" \ + "${user_host}" + # upload root + rsync --delete --recursive "${MAIN_BASH_ROOT}/" "${user_host}:/etc/bash/" + # call setup + # TODO variable + ssh "${user_host}" -- \ + "source \"/etc/bash/main.sh\" ; ovh-rescue-configure \"${host}\"" + # create session + ssh "${user_host}" -- byobu new-session -d + # send keys + ssh "${user_host}" -- byobu send-keys "ovh-rescue-install" "C-m" + # attach session + mosh "${user_host}" -- byobu attach-session + else + echo 'Host?' + return 1 + fi } ovh_rescue_wipe_1_2TB() { @@ -140,22 +141,22 @@ ovh_rescue_wipe_1_2TB() { printf "PassPhrase: " read -r -s passphrase # encrypt - echo "${passphrase}" \ - | cryptsetup \ - --verbose \ - --batch-mode \ - --type "luks2" \ - --pbkdf "argon2id" \ - --cipher "aes-xts-plain64" \ - --iter-time 8192 \ - --key-size 512 \ - --hash "sha512" \ - --use-random \ - luksFormat \ - "/dev/sda1" + echo "${passphrase}" | + cryptsetup \ + --verbose \ + --batch-mode \ + --type "luks2" \ + --pbkdf "argon2id" \ + --cipher "aes-xts-plain64" \ + --iter-time 8192 \ + --key-size 512 \ + --hash "sha512" \ + --use-random \ + luksFormat \ + "/dev/sda1" # open - echo "${passphrase}" \ - | cryptsetup luksOpen "/dev/sda1" "crypt" + echo "${passphrase}" | + cryptsetup luksOpen "/dev/sda1" "crypt" # pv pvcreate "/dev/mapper/crypt" # vg