From fe0654af1a0fd2f46e9023690d3d4a2f5e1d34da 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 +++++++++---------- .../content/pages/installation/index.markdown | 8 ++--- .../pages/user-guide/code/download-conf.sh | 2 +- 5 files changed, 26 insertions(+), 26 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/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