Skip to content

Commit 24affda

Browse files
picodotdevpicodotdev
committed
Replace master branch references by main branch
Fixes #255
1 parent 254839c commit 24affda

21 files changed

+45
-45
lines changed

‎.github/workflows/alis-site-deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
deploy:
88
runs-on: ubuntu-latest
99
env:
10-
HUGO_VERSION: 0.121.1
10+
HUGO_VERSION: 0.135.0
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
with:
14-
ref: master
15-
- uses: actions/checkout@v2
14+
ref: main
15+
- uses: actions/checkout@v4
1616
with:
1717
path: site/deploy/
1818
ref: gh-pages

‎.github/workflows/shellcheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Shellcheck
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
shellcheck:

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# alis
22

3-
![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux-badge.svg)
4-
![Bash](https://raw.githubusercontent.com/picodotdev/alis/master/images/sh-bash-badge.svg)
3+
![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux-badge.svg)
4+
![Bash](https://raw.githubusercontent.com/picodotdev/alis/main/images/sh-bash-badge.svg)
55
![Shellcheck](https://github.com/picodotdev/alis/actions/workflows/shellcheck.yml/badge.svg)
66

77
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
2727

2828
**Arch Linux Install Script (alis) is based on Arch Linux but is NOT approved, sponsored, or affiliated with Arch Linux or its related projects.**
2929

30-
[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/master/images/archlinux.svg "Arch Linux")](https://www.archlinux.org/)
30+
[![Arch Linux](https://raw.githubusercontent.com/picodotdev/alis/main/images/archlinux.svg "Arch Linux")](https://www.archlinux.org/)
3131

3232
## Index
3333

@@ -109,7 +109,7 @@ Internet connection is required, with wireless WIFI connection see <a href="http
109109
```
110110
# # Start the system with latest Arch Linux installation media
111111
# loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
112-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
112+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
113113
# vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
114114
# ./alis.sh # Start installation
115115
```
@@ -120,9 +120,9 @@ Internet connection is required, with wireless WIFI connection see <a href="http
120120
# # Start the system with latest Arch Linux installation media
121121
# loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
122122
# iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE.
123-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
123+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
124124
# # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
125-
# # 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
125+
# # 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
126126
# ./alis-asciinema.sh # (Optional) Start asciinema video recording
127127
# vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
128128
# vim alis-packages.conf # (Optional) Edit configuration and change variables values with your preferences (packages to install)
@@ -137,7 +137,7 @@ After the base Arch Linux system is installed, alis can install packages with pa
137137

138138
```
139139
# # After system installation start a user session
140-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
140+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
141141
# # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
142142
# ./alis-packages-asciinema.sh # (Optional) Start asciinema video recording
143143
# vim alis-packages.conf # Edit configuration and change variables values with your preferences (packages to install)
@@ -152,7 +152,7 @@ Boot from the latest <a href="https://www.archlinux.org/download/">original Arch
152152
# # Start the system with latest Arch Linux installation media
153153
# loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
154154
# iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE.
155-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
155+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
156156
# # curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
157157
# ./alis-recovery-asciinema.sh # (Optional) Start asciinema video recording
158158
# 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
188188

189189
These are some desktop environments that can be installed.
190190

191-
[![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)
192-
[![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)
193-
[![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)
194-
[![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)
195-
[![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)
196-
[![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)
197-
[![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)
191+
[![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)
192+
[![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)
193+
[![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)
194+
[![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)
195+
[![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)
196+
[![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)
197+
[![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)
198198

199199
## Video
200200

‎alis-cloud-init-ssh.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44
# ./alis-cloud-init-ssh.sh -b sid -i 192.168.122.61 -c alis-config-efi-ext4-luks-systemd.sh
55

66
GITHUB_USER="picodotdev"
7-
BRANCH="master"
7+
BRANCH="main"
88
BRANCH_QUALIFIER=""
99
IP_ADDRESS=""
1010
VM_TYPE="virtualbox"

‎alis-packages.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Some variables are boolean with a value of true or false.
66
#
77
# Read the Arch Linux wiki pages to learn more about the variables values.
8-
# https://github.com/picodotdev/alis/blob/master/README.md
8+
# https://github.com/picodotdev/alis/blob/main/README.md
99

1010
# init
1111
## LOG_TRACE outputs the comands executed.

‎alis-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set -eu
4141
#
4242
# Usage:
4343
# # loadkeys es
44-
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash
44+
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash
4545
# # vim alis-packages.conf
4646
# # ./alis-packages.sh
4747

‎alis-packer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -eu
66
# Copyright (C) 2022 picodotdev
77

88
CONFIG_FILE="alis-packer.json"
9-
BRANCH="master"
9+
BRANCH="main"
1010
BRANCH_QUALIFIER=""
1111
CONFIG_FILE_SH="alis-config-efi-ext4-systemd.sh"
1212

‎alis-recovery.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Some variables are boolean with a value of true or false.
66
#
77
# Read the Arch Linux wiki pages to learn more about the variables values.
8-
# https://github.com/picodotdev/alis/blob/master/README.md
8+
# https://github.com/picodotdev/alis/blob/main/README.md
99

1010
# init
1111
## KEYS sets keyboard layout.

‎alis-recovery.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set -eu
4242
#
4343
# Usage:
4444
# # loadkeys es
45-
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash
45+
# # curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash
4646
# # vim alis-recovery.conf
4747
# # ./alis-recovery.sh
4848

‎alis.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Some variables are experimental feature (use it and report in case of errors)
77
#
88
# Read the Arch Linux wiki pages to learn more about the variables values.
9-
# https://github.com/picodotdev/alis/blob/master/README.md
9+
# https://github.com/picodotdev/alis/blob/main/README.md
1010

1111
# init
1212
## KEYS sets keyboard layout.

‎alis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set -eu
4444
#
4545
# Usage:
4646
# # loadkeys es
47-
# # curl https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash
47+
# # curl https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash
4848
# # vim alis.conf
4949
# # ./alis.sh
5050

‎download.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -eu
88
# Copyright (C) 2022 picodotdev
99

1010
GITHUB_USER="picodotdev"
11-
BRANCH="master"
11+
BRANCH="main"
1212
HASH=""
1313
ARTIFACT="alis-${BRANCH}"
1414

‎site/content/_index.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ It is a simple Bash script developed from many Arch Linux Wiki pages that fully
8585
<div class="card-body">
8686
<h5 class="card-title fw-bold">Simple configuration</h5>
8787
<p class="card-text">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.</p>
88-
<a href="https://github.com/picodotdev/alis/blob/master/alis.conf" class="card-link">Configuration file</a>
88+
<a href="https://github.com/picodotdev/alis/blob/main/alis.conf" class="card-link">Configuration file</a>
8989
</div>
9090
</div>
9191
</div>

‎site/content/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
# # Start the system with latest Arch Linux installation media
33
# loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
4-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
4+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
55
# vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
66
# ./alis.sh # Start installation

‎site/content/pages/installation/index.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ draft: true
101101
{{< highlight bash "" >}}
102102
# Start the system with latest Arch Linux installation media
103103
loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
104-
curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
104+
curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
105105
vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
106106
./alis.sh # Start installation
107107
{{< / highlight >}}
@@ -112,7 +112,7 @@ vim alis.conf # Edit configuration and change variables values with yo
112112
# Start the system with latest Arch Linux installation media
113113
loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
114114
iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE.
115-
curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
115+
curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
116116
# curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
117117
./alis-asciinema.sh # (Optional) Start asciinema video recording
118118
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
150150
</p>
151151
{{< highlight bash "" >}}
152152
# After system installation start a user session
153-
curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
153+
curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
154154
# curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
155155
./alis-packages-asciinema.sh # (Optional) Start asciinema video recording
156156
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
174174
# Start the system with latest Arch Linux installation media
175175
loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
176176
iwctl --passphrase "[WIFI_KEY]" station [WIFI_INTERFACE] connect "[WIFI_ESSID]" # (Optional) Connect to WIFI network. _ip link show_ to know WIFI_INTERFACE.
177-
curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
177+
curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
178178
# curl -sL https://git.io/JeaH6 | bash # Alternative download URL with URL shortener
179179
./alis-recovery-asciinema.sh # (Optional) Start asciinema video recording
180180
vim alis-recovery.conf # Edit configuration and change variables values with your last installation configuration with alis (mainly device and partition scheme)

‎site/content/pages/user-guide/code/download-conf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# shellcheck disable=SC2148
22
# SC2148: Tips depend on target shell and yours is unknown. Add a shebang.
3-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash -s -u picodotdev
3+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash -s -u picodotdev

‎site/content/pages/user-guide/code/download.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# shellcheck disable=SC2148
22
# SC2148: Tips depend on target shell and yours is unknown. Add a shebang.
3-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash
3+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash

‎site/content/pages/user-guide/code/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# SC2148: Tips depend on target shell and yours is unknown. Add a shebang.
33
# # Start the system with latest Arch Linux installation media
44
# loadkeys [keymap] # Load keyboard keymap, eg. loadkeys es, loadkeys us, loadkeys de
5-
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/master/download.sh | bash # Download alis scripts
5+
# curl -sL https://raw.githubusercontent.com/picodotdev/alis/main/download.sh | bash # Download alis scripts
66
# vim alis.conf # Edit configuration and change variables values with your preferences (system configuration)
77
# ./alis.sh # Start installation

‎site/content/pages/user-guide/code/ls-alis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ total 1520
1010
-rwxr-xr-x 1 picodotdev picodotdev 13336 mar 20 11:40 alis-commons.sh
1111
-rw-r--r-- 1 picodotdev picodotdev 9319 mar 20 11:40 alis.conf
1212
-rwxr-xr-x 1 picodotdev picodotdev 975 mar 20 11:40 alis-kvm-virt-install.sh
13-
drwxr-xr-x 8 picodotdev picodotdev 4096 mar 20 11:04 alis-master
14-
-rw-r--r-- 1 picodotdev picodotdev 1354656 mar 20 11:40 alis-master.zip
13+
drwxr-xr-x 8 picodotdev picodotdev 4096 mar 20 11:04 alis-main
14+
-rw-r--r-- 1 picodotdev picodotdev 1354656 mar 20 11:40 alis-main.zip
1515
-rwxr-xr-x 1 picodotdev picodotdev 514 mar 20 11:40 alis-packages-asciinema.sh
1616
-rw-r--r-- 1 picodotdev picodotdev 5672 mar 20 11:40 alis-packages.conf
1717
-rwxr-xr-x 1 picodotdev picodotdev 548 mar 20 11:40 alis-packages-exit.sh

0 commit comments

Comments
 (0)