diff options
author | pico.dev <pico.dev@gmail.com> | 2020-07-19 12:47:41 +0200 |
---|---|---|
committer | pico.dev <pico.dev@gmail.com> | 2020-07-19 12:47:41 +0200 |
commit | 8fb5fba85ebe3b07aa5759d21c0c701e2f25894e (patch) | |
tree | dd67eb9798dbf2643e904af3fd1191dc644921c8 | |
parent | a22b6e427922cf03468fa5750c8e332a6466cc39 (diff) |
Replace wget with curl as download tool
Fixes #95
20 files changed, 50 insertions, 61 deletions
diff --git a/alis-asciinema.sh b/alis-asciinema.sh index 0f70159..0f70159 100644..100755 --- a/alis-asciinema.sh +++ b/alis-asciinema.sh diff --git a/alis-reboot.sh b/alis-reboot.sh index 8c2bfbd..8c2bfbd 100644..100755 --- a/alis-reboot.sh +++ b/alis-reboot.sh diff --git a/alis-recovery-asciinema.sh b/alis-recovery-asciinema.sh index 2636d16..f1186cd 100644..100755 --- a/alis-recovery-asciinema.sh +++ b/alis-recovery-asciinema.sh @@ -5,8 +5,8 @@ set -e # and customized Arch Linux system. # Copyright (C) 2018 picodotdev -wget https://github.com/asciinema/asciinema/archive/v2.0.1.zip -O asciinema-2.0.1.zip -bsdtar -x -f asciinema-2.0.1.zip -cp -r asciinema-2.0.1/* . +curl -o asciinema-2.0.2.zip https://github.com/asciinema/asciinema/archive/v2.0.2.zip +bsdtar -x -f asciinema-2.0.2.zip +cp -r asciinema-2.0.2/* . rm -f alis.asciinema python3 -m asciinema rec -i 5 ~/alis-recovery.asciinema
\ No newline at end of file diff --git a/alis-recovery-reboot.sh b/alis-recovery-reboot.sh index 8cbec02..8cbec02 100644..100755 --- a/alis-recovery-reboot.sh +++ b/alis-recovery-reboot.sh diff --git a/alis-recovery.sh b/alis-recovery.sh index 816fb02..816fb02 100644..100755 --- a/alis-recovery.sh +++ b/alis-recovery.sh diff --git a/download-packer.sh b/download-packer.sh index 30d2016..fcf995f 100644..100755 --- a/download-packer.sh +++ b/download-packer.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash set -e -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis.conf -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-packer.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis.conf +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-packer.sh mkdir -p packer/ -wget -O packer/alis-packer-efi-btrfs-luks-lvm-systemd.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-btrfs-luks-lvm-systemd.json -wget -O packer/alis-packer-efi-ext4-grub-gnome.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-gnome.json -wget -O packer/alis-packer-efi-ext4-grub-kde.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-kde.json -wget -O packer/alis-packer-efi-ext4-grub-xfce.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-xfce.json -wget -O packer/alis-packer-efi-ext4-luks-lvm-grub.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-luks-lvm-grub.json -wget -O packer/alis-packer-efi-f2fs-luks-lvm-systemd.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json +curl -o packer/alis-packer-efi-btrfs-luks-lvm-systemd.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-btrfs-luks-lvm-systemd.json +curl -o packer/alis-packer-efi-ext4-grub-gnome.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-gnome.json +curl -o packer/alis-packer-efi-ext4-grub-kde.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-kde.json +curl -o packer/alis-packer-efi-ext4-grub-xfce.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-grub-xfce.json +curl -o packer/alis-packer-efi-ext4-luks-lvm-grub.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-ext4-luks-lvm-grub.json +curl -o packer/alis-packer-efi-f2fs-luks-lvm-systemd.json https://raw.githubusercontent.com/picodotdev/alis/master/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json chmod +x ./alis-packer.sh ./alis-packer.sh diff --git a/download-sid.sh b/download-sid.sh index 86757aa..4ea61c4 100644..100755 --- a/download-sid.sh +++ b/download-sid.sh @@ -15,15 +15,15 @@ rm -f alis-recovery.sh rm -f alis-recovery-asciinema.sh rm -f alis-recovery-reboot.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis.conf -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-asciinema.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-reboot.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis.conf +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-asciinema.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-reboot.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery.conf -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery-asciinema.sh -wget https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery-reboot.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery.conf +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery-asciinema.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/sid/alis-recovery-reboot.sh chmod +x alis.sh chmod +x alis-asciinema.sh diff --git a/download.sh b/download.sh index 94c76d0..2e8858a 100644..100755 --- a/download.sh +++ b/download.sh @@ -15,15 +15,15 @@ rm -f alis-recovery.sh rm -f alis-recovery-asciinema.sh rm -f alis-recovery-reboot.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis.conf -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-asciinema.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-reboot.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis.conf +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-asciinema.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-reboot.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery.conf -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery-asciinema.sh -wget https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery-reboot.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery.conf +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery-asciinema.sh +curl -O https://raw.githubusercontent.com/picodotdev/alis/master/alis-recovery-reboot.sh chmod +x alis.sh chmod +x alis-asciinema.sh diff --git a/packer/alis-packer-bios-ext4-grub-luks-lvm.json b/packer/alis-packer-bios-ext4-grub-luks-lvm.json index a78c682..15bbbd5 100644 --- a/packer/alis-packer-bios-ext4-grub-luks-lvm.json +++ b/packer/alis-packer-bios-ext4-grub-luks-lvm.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-bios-ext4-grub.json b/packer/alis-packer-bios-ext4-grub.json index 062183f..9e5bafa 100644 --- a/packer/alis-packer-bios-ext4-grub.json +++ b/packer/alis-packer-bios-ext4-grub.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json b/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json index c119f08..ba78481 100644 --- a/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json +++ b/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-grub-gnome.json b/packer/alis-packer-efi-ext4-grub-gnome.json index bda282e..1607c13 100644 --- a/packer/alis-packer-efi-ext4-grub-gnome.json +++ b/packer/alis-packer-efi-ext4-grub-gnome.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-grub-kde.json b/packer/alis-packer-efi-ext4-grub-kde.json index 94b9c36..80c0cb7 100644 --- a/packer/alis-packer-efi-ext4-grub-kde.json +++ b/packer/alis-packer-efi-ext4-grub-kde.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-grub-xfce.json b/packer/alis-packer-efi-ext4-grub-xfce.json index c5a02d6..ec2131d 100644 --- a/packer/alis-packer-efi-ext4-grub-xfce.json +++ b/packer/alis-packer-efi-ext4-grub-xfce.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-luks-grub.json b/packer/alis-packer-efi-ext4-luks-grub.json index d41d3f6..b3198b1 100644 --- a/packer/alis-packer-efi-ext4-luks-grub.json +++ b/packer/alis-packer-efi-ext4-luks-grub.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-luks-lvm-grub.json b/packer/alis-packer-efi-ext4-luks-lvm-grub.json index c8e7d39..403344c 100644 --- a/packer/alis-packer-efi-ext4-luks-lvm-grub.json +++ b/packer/alis-packer-efi-ext4-luks-lvm-grub.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.json b/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.json index 7edffe9..b2fbe74 100644 --- a/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.json +++ b/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-ext4-luks-lvm-systemd.json b/packer/alis-packer-efi-ext4-luks-lvm-systemd.json index 30d8739..e3a2836 100644 --- a/packer/alis-packer-efi-ext4-luks-lvm-systemd.json +++ b/packer/alis-packer-efi-ext4-luks-lvm-systemd.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", diff --git a/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json b/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json index 791db3b..594fabd 100644 --- a/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json +++ b/packer/alis-packer-efi-f2fs-luks-lvm-systemd.json @@ -1,6 +1,6 @@ { "variables": { - "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso", + "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.07.01-x86_64.iso", "disk_size": "16384" }, "builders": [ @@ -20,8 +20,7 @@ "disk_size": "{{user `disk_size`}}", "hard_drive_interface": "sata", "iso_url": "{{user `iso`}}", - "iso_checksum": "fe15ff1c688c078d035e275a4946075281f5324e", - "iso_checksum_type": "sha1", + "iso_checksum": "sha1:8bcd9ef5d7bd22a5e1de671905abaf07ca8cd7f5", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_wait_timeout": "60m", |