Skip to content

Commit

Permalink
Replace master branch references by main branch
Browse files Browse the repository at this point in the history
Fixes #255
  • Loading branch information
picodotdev committed Oct 6, 2024
1 parent 254839c commit fe0654a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/alis-site-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Shellcheck
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
shellcheck:
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand Down Expand Up @@ -109,7 +109,7 @@ Internet connection is required, with wireless WIFI connection see <a href="http
```
# # 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
```
Expand All @@ -120,9 +120,9 @@ Internet connection is required, with wireless WIFI connection see <a href="http
# # 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
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash -s -- -h [HASH_COMMIT] # Use specific version of the script based on the commit hash
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash -s -- -h [HASH_COMMIT] # Use specific version of the script based on the commit hash
# ./alis-asciinema.sh # (Optional) Start asciinema video recording
# vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
# vim alis-packages.conf # (Optional) Edit configuration and change variables values with your preferences (packages to install)
Expand All @@ -137,7 +137,7 @@ After the base Arch Linux system is installed, alis can install packages with pa

```
# # 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)
Expand All @@ -152,7 +152,7 @@ Boot from the latest <a href="https://www.archlinux.org/download/">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)
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions site/content/pages/installation/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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 >}}
Expand All @@ -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)
Expand Down Expand Up @@ -150,7 +150,7 @@ vim alis-packages.conf # (Optional) Edit configuration and change variables val
</p>
{{< 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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion site/content/pages/user-guide/code/download-conf.sh
Original file line number Diff line number Diff line change
@@ -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
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash -s -u picodotdev

0 comments on commit fe0654a

Please sign in to comment.