From 24affdaec57648dbca5f381f886c203e5d7e22f8 Mon Sep 17 00:00:00 2001 From: "pico.dev" Date: Sun, 6 Oct 2024 13:50:42 +0200 Subject: [PATCH] Replace master branch references by main branch Fixes #255 --- .github/workflows/alis-site-deploy.yml | 8 ++--- .github/workflows/shellcheck.yml | 4 +-- README.md | 30 +++++++++---------- alis-cloud-init-ssh.sh | 2 +- alis-packages.conf | 2 +- alis-packages.sh | 2 +- alis-packer.sh | 2 +- alis-recovery.conf | 2 +- alis-recovery.sh | 2 +- alis.conf | 2 +- alis.sh | 2 +- download.sh | 2 +- site/content/_index.markdown | 2 +- site/content/install.sh | 2 +- .../content/pages/installation/index.markdown | 8 ++--- .../pages/user-guide/code/download-conf.sh | 2 +- .../content/pages/user-guide/code/download.sh | 2 +- site/content/pages/user-guide/code/install.sh | 2 +- site/content/pages/user-guide/code/ls-alis.sh | 4 +-- site/content/pages/user-guide/index.markdown | 6 ++-- site/install.sh | 2 +- 21 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/alis-site-deploy.yml b/.github/workflows/alis-site-deploy.yml index 99a671e9..66ca7ab7 100644 --- a/.github/workflows/alis-site-deploy.yml +++ b/.github/workflows/alis-site-deploy.yml @@ -7,12 +7,12 @@ jobs: deploy: runs-on: ubuntu-latest env: - HUGO_VERSION: 0.121.1 + HUGO_VERSION: 0.135.0 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: - ref: master - - uses: actions/checkout@v2 + ref: main + - uses: actions/checkout@v4 with: path: site/deploy/ ref: gh-pages diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 46b4de73..b43999de 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -3,10 +3,10 @@ name: Shellcheck on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: shellcheck: diff --git a/README.md b/README.md index d845bf32..270f75d4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # alis -![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-badge.svg) -![Bash](https://raw.githubusercontent.com/picodotdev/alis/master/images/sh-bash-badge.svg) +![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-badge.svg) +![Bash](https://raw.githubusercontent.com/picodotdev/alis/main/images/sh-bash-badge.svg) ![Shellcheck](https://github.com/picodotdev/alis/actions/workflows/shellcheck.yml/badge.svg) Arch Linux Install Script (or alis, also known as _the Arch Linux executable installation guide and wiki_) installs an unattended, automated and customized Arch Linux system. @@ -27,7 +27,7 @@ For new features, improvements and bugs, fill an issue in GitHub or make a pull **Arch Linux Install Script (alis) is based on Arch Linux but is NOT approved, sponsored, or affiliated with Arch Linux or its related projects.** -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux.svg "Arch Linux")](https://www.archlinux.org/) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux.svg "Arch Linux")](https://www.archlinux.org/) ## Index @@ -109,7 +109,7 @@ Internet connection is required, with wireless WIFI connection see original Arch # # Start the system with latest Arch Linux installation media # loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de # iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE. -# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener # ./alis-recovery-asciinema.sh # (Optional) Start asciinema video recording # vim alis-recovery.conf # Edit configuration and change variables values with your last installation configuration with alis (mainly device and partition scheme) @@ -188,13 +188,13 @@ Once the installation ends, you will have a ready to use system with your choose These are some desktop environments that can be installed. -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-gnome-thumb.jpg "Arch Linux with GNOME")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-gnome.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-kde-thumb.jpg "Arch Linux with KDE")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-kde.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-xfce-thumb.jpg "Arch Linux with XFCE")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-xfce.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-cinnamon-thumb.jpg "Arch Linux with Cinnamon")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-cinnamon.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-mate-thumb.jpg "Arch Linux with Mate")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-mate.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-lxde-thumb.jpg "Arch Linux with LXDE")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-lxde.jpg) -[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-root-password-thumb.png "Arch Linux unloking LUKS on boot")](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-root-password.png) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-gnome-thumb.jpg "Arch Linux with GNOME")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-gnome.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-kde-thumb.jpg "Arch Linux with KDE")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-kde.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-xfce-thumb.jpg "Arch Linux with XFCE")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-xfce.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-cinnamon-thumb.jpg "Arch Linux with Cinnamon")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-cinnamon.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-mate-thumb.jpg "Arch Linux with Mate")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-mate.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-lxde-thumb.jpg "Arch Linux with LXDE")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-lxde.jpg) +[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-root-password-thumb.png "Arch Linux unloking LUKS on boot")](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-root-password.png) ## Video diff --git a/alis-cloud-init-ssh.sh b/alis-cloud-init-ssh.sh index 2b7aaa1b..84ef1296 100755 --- a/alis-cloud-init-ssh.sh +++ b/alis-cloud-init-ssh.sh @@ -4,7 +4,7 @@ set -eu # ./alis-cloud-init-ssh.sh -b sid -i 192.168.122.61 -c alis-config-efi-ext4-luks-systemd.sh GITHUB_USER="picodotdev" -BRANCH="master" +BRANCH="main" BRANCH_QUALIFIER="" IP_ADDRESS="" VM_TYPE="virtualbox" diff --git a/alis-packages.conf b/alis-packages.conf index 26a84e61..ddff7043 100644 --- a/alis-packages.conf +++ b/alis-packages.conf @@ -5,7 +5,7 @@ # Some variables are boolean with a value of true or false. # # Read the Arch Linux wiki pages to learn more about the variables values. -# https://github.com/picodotdev/alis/blob/master/README.md +# https://github.com/picodotdev/alis/blob/main/README.md # init ## LOG_TRACE outputs the comands executed. diff --git a/alis-packages.sh b/alis-packages.sh index e2db93af..8a95a67a 100755 --- a/alis-packages.sh +++ b/alis-packages.sh @@ -41,7 +41,7 @@ set -eu # # Usage: # # loadkeys es -# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash +# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # # vim alis-packages.conf # # ./alis-packages.sh diff --git a/alis-packer.sh b/alis-packer.sh index 0bb51f53..8178f3bd 100755 --- a/alis-packer.sh +++ b/alis-packer.sh @@ -6,7 +6,7 @@ set -eu # Copyright (C) 2022 picodotdev CONFIG_FILE="alis-packer.json" -BRANCH="master" +BRANCH="main" BRANCH_QUALIFIER="" CONFIG_FILE_SH="alis-config-efi-ext4-systemd.sh" diff --git a/alis-recovery.conf b/alis-recovery.conf index 5661b6be..7f621f09 100644 --- a/alis-recovery.conf +++ b/alis-recovery.conf @@ -5,7 +5,7 @@ # Some variables are boolean with a value of true or false. # # Read the Arch Linux wiki pages to learn more about the variables values. -# https://github.com/picodotdev/alis/blob/master/README.md +# https://github.com/picodotdev/alis/blob/main/README.md # init ## KEYS sets keyboard layout. diff --git a/alis-recovery.sh b/alis-recovery.sh index d46ef9ed..f9fb3e83 100755 --- a/alis-recovery.sh +++ b/alis-recovery.sh @@ -42,7 +42,7 @@ set -eu # # Usage: # # loadkeys es -# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash +# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # # vim alis-recovery.conf # # ./alis-recovery.sh diff --git a/alis.conf b/alis.conf index 0bac6d37..6e4c9791 100644 --- a/alis.conf +++ b/alis.conf @@ -6,7 +6,7 @@ # Some variables are experimental feature (use it and report in case of errors) # # Read the Arch Linux wiki pages to learn more about the variables values. -# https://github.com/picodotdev/alis/blob/master/README.md +# https://github.com/picodotdev/alis/blob/main/README.md # init ## KEYS sets keyboard layout. diff --git a/alis.sh b/alis.sh index 37723265..765f2a1a 100755 --- a/alis.sh +++ b/alis.sh @@ -44,7 +44,7 @@ set -eu # # Usage: # # loadkeys es -# # curl https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash +# # curl https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # # vim alis.conf # # ./alis.sh diff --git a/download.sh b/download.sh index f11c2fe9..f87326da 100755 --- a/download.sh +++ b/download.sh @@ -8,7 +8,7 @@ set -eu # Copyright (C) 2022 picodotdev GITHUB_USER="picodotdev" -BRANCH="master" +BRANCH="main" HASH="" ARTIFACT="alis-${BRANCH}" diff --git a/site/content/_index.markdown b/site/content/_index.markdown index f3bf04b4..e92cdb0a 100644 --- a/site/content/_index.markdown +++ b/site/content/_index.markdown @@ -85,7 +85,7 @@ It is a simple Bash script developed from many Arch Linux Wiki pages that fully
Simple configuration

The configuration is a simple Bash file that defines some environment variables to customize the installation to each user own preferences. Simple variables but that allow most common and quite advanced configurations.

- Configuration file + Configuration file
diff --git a/site/content/install.sh b/site/content/install.sh index cb1d57dd..7adbf228 100644 --- a/site/content/install.sh +++ b/site/content/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # # Start the system with latest Arch Linux installation media # loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de -# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # vim alis.conf # Edit configuration and change variables values with your preferences (system configuration) # ./alis.sh # Start installation \ No newline at end of file diff --git a/site/content/pages/installation/index.markdown b/site/content/pages/installation/index.markdown index 6eabc160..4e7eb158 100644 --- a/site/content/pages/installation/index.markdown +++ b/site/content/pages/installation/index.markdown @@ -101,7 +101,7 @@ draft: true {{< highlight bash "" >}} # Start the system with latest Arch Linux installation media loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de -curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts vim alis.conf # Edit configuration and change variables values with your preferences (system configuration) ./alis.sh # Start installation {{< / highlight >}} @@ -112,7 +112,7 @@ vim alis.conf # Edit configuration and change variables values with yo # Start the system with latest Arch Linux installation media loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE. -curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener ./alis-asciinema.sh # (Optional) Start asciinema video recording vim alis.conf # Edit configuration and change variables values with your preferences (system configuration) @@ -150,7 +150,7 @@ vim alis-packages.conf # (Optional) Edit configuration and change variables val

{{< highlight bash "" >}} # After system installation start a user session -curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener ./alis-packages-asciinema.sh # (Optional) Start asciinema video recording vim alis-packages.conf # Edit configuration and change variables values with your preferences (packages to install) @@ -174,7 +174,7 @@ vim alis-packages.conf # Edit configuration and change variables value # Start the system with latest Arch Linux installation media loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE. -curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener ./alis-recovery-asciinema.sh # (Optional) Start asciinema video recording vim alis-recovery.conf # Edit configuration and change variables values with your last installation configuration with alis (mainly device and partition scheme) diff --git a/site/content/pages/user-guide/code/download-conf.sh b/site/content/pages/user-guide/code/download-conf.sh index a1939b71..4f85fc5a 100644 --- a/site/content/pages/user-guide/code/download-conf.sh +++ b/site/content/pages/user-guide/code/download-conf.sh @@ -1,3 +1,3 @@ # shellcheck disable=SC2148 # SC2148: Tips depend on target shell and yours is unknown. Add a shebang. -# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash -s -u picodotdev \ No newline at end of file +# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash -s -u picodotdev \ No newline at end of file diff --git a/site/content/pages/user-guide/code/download.sh b/site/content/pages/user-guide/code/download.sh index e77edea8..1845af75 100644 --- a/site/content/pages/user-guide/code/download.sh +++ b/site/content/pages/user-guide/code/download.sh @@ -1,3 +1,3 @@ # shellcheck disable=SC2148 # SC2148: Tips depend on target shell and yours is unknown. Add a shebang. -# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash \ No newline at end of file +# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash \ No newline at end of file diff --git a/site/content/pages/user-guide/code/install.sh b/site/content/pages/user-guide/code/install.sh index 435433d4..dce0e28d 100644 --- a/site/content/pages/user-guide/code/install.sh +++ b/site/content/pages/user-guide/code/install.sh @@ -2,6 +2,6 @@ # SC2148: Tips depend on target shell and yours is unknown. Add a shebang. # # Start the system with latest Arch Linux installation media # loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de -# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts +# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts # vim alis.conf # Edit configuration and change variables values with your preferences (system configuration) # ./alis.sh # Start installation \ No newline at end of file diff --git a/site/content/pages/user-guide/code/ls-alis.sh b/site/content/pages/user-guide/code/ls-alis.sh index 8c4fae21..7b26f799 100644 --- a/site/content/pages/user-guide/code/ls-alis.sh +++ b/site/content/pages/user-guide/code/ls-alis.sh @@ -10,8 +10,8 @@ total 1520 -rwxr-xr-x 1 picodotdev picodotdev 13336 mar 20 11:40 alis-commons.sh -rw-r--r-- 1 picodotdev picodotdev 9319 mar 20 11:40 alis.conf -rwxr-xr-x 1 picodotdev picodotdev 975 mar 20 11:40 alis-kvm-virt-install.sh -drwxr-xr-x 8 picodotdev picodotdev 4096 mar 20 11:04 alis-master --rw-r--r-- 1 picodotdev picodotdev 1354656 mar 20 11:40 alis-master.zip +drwxr-xr-x 8 picodotdev picodotdev 4096 mar 20 11:04 alis-main +-rw-r--r-- 1 picodotdev picodotdev 1354656 mar 20 11:40 alis-main.zip -rwxr-xr-x 1 picodotdev picodotdev 514 mar 20 11:40 alis-packages-asciinema.sh -rw-r--r-- 1 picodotdev picodotdev 5672 mar 20 11:40 alis-packages.conf -rwxr-xr-x 1 picodotdev picodotdev 548 mar 20 11:40 alis-packages-exit.sh diff --git a/site/content/pages/user-guide/index.markdown b/site/content/pages/user-guide/index.markdown index 82af1ed4..c231db50 100644 --- a/site/content/pages/user-guide/index.markdown +++ b/site/content/pages/user-guide/index.markdown @@ -277,9 +277,9 @@ alis also offers support to install Arch Linux in an automated and easy way on a For installation on virtual machines alis offers three scripts. -* [alis-cloud-init-iso.sh](https://github.com/picodotdev/alis/blob/master/alis-cloud-init-iso.sh) which creates a private and public key pair for the SSH connection and creates a disk image that includes the public key and other instructions for virtual machine initialization provided with cloud-init. The iso image has to be mounted on the virtual machine. -* [alis-kvm-virt-install.sh](https://github.com/picodotdev/alis/blob/master/alis-kvm-virt-install.sh) contains the command to create a virtual machine with KVM on GNU/Linux and the definition of the characteristics of the virtual machine in terms of memory size, virtual CPUs, system BIOS, and storage space as well as network connection. The virtual machine mounts the iso image created in the previous command. -* [alis-cloud-init-ssh.sh](https://github.com/picodotdev/alis/blob/master/alis-cloud-init-ssh.sh) once the virtual machine is started and knowing the IP address assigned to it, this command makes the SSH connection using the private key SSH to perform authentication. And perform the alis script download. In addition, the command with an option allows you to start the installation by applying the changes with the desired configuration to the configuration file and start the installation. +* [alis-cloud-init-iso.sh](https://github.com/picodotdev/alis/blob/main/alis-cloud-init-iso.sh) which creates a private and public key pair for the SSH connection and creates a disk image that includes the public key and other instructions for virtual machine initialization provided with cloud-init. The iso image has to be mounted on the virtual machine. +* [alis-kvm-virt-install.sh](https://github.com/picodotdev/alis/blob/main/alis-kvm-virt-install.sh) contains the command to create a virtual machine with KVM on GNU/Linux and the definition of the characteristics of the virtual machine in terms of memory size, virtual CPUs, system BIOS, and storage space as well as network connection. The virtual machine mounts the iso image created in the previous command. +* [alis-cloud-init-ssh.sh](https://github.com/picodotdev/alis/blob/main/alis-cloud-init-ssh.sh) once the virtual machine is started and knowing the IP address assigned to it, this command makes the SSH connection using the private key SSH to perform authentication. And perform the alis script download. In addition, the command with an option allows you to start the installation by applying the changes with the desired configuration to the configuration file and start the installation. The commands to execute are the following: diff --git a/site/install.sh b/site/install.sh index f9a66a0d..64d2d165 100644 --- a/site/install.sh +++ b/site/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -git clone -b master git@github.com:picodotdev/alis.git +git clone -b main git@github.com:picodotdev/alis.git cd alis || exit git config --local user.email "pico.dev@gmail.com" git config --local user.name "pico.dev"