Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-12-27 09:58:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use curl instead of wget (#63)

Browse source
This commit is contained in:
ghtm2 2023-02-16 11:48:21 +01:00 committed by GitHub
parent b3c16de238
commit b21c8401ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conty-start.sh
View file

@ -431,7 +431,7 @@ if { [ "$1" = "-u" ] || [ "$1" = "-U" ]; } && [ -z "${script_is_symlink}" ]; the
# Download or extract the utils.tar.gz and the init script depending # Download or extract the utils.tar.gz and the init script depending
# on what command line argument is used (-u or -U) # on what command line argument is used (-u or -U)
clear clear
if [ "$1" = "-U" ] && command -v wget 1>/dev/null; then if [ "$1" = "-U" ] && command -v curl 1>/dev/null; then
if [ "${dwarfs_image}" = 1 ]; then if [ "${dwarfs_image}" = 1 ]; then
utils="utils_dwarfs.tar.gz" utils="utils_dwarfs.tar.gz"
else else
@ -439,8 +439,8 @@ if { [ "$1" = "-u" ] || [ "$1" = "-U" ]; } && [ -z "${script_is_symlink}" ]; the
fi fi
echo "Downloading the init script and the utils" echo "Downloading the init script and the utils"
wget -q --show-progress "https://github.com/Kron4ek/Conty/raw/master/conty-start.sh" curl -#LO "https://github.com/Kron4ek/Conty/raw/master/conty-start.sh"
wget -q --show-progress -O utils.tar.gz "https://github.com/Kron4ek/Conty/raw/master/${utils}" curl -#Lo utils.tar.gz "https://github.com/Kron4ek/Conty/raw/master/${utils}"
fi fi
if [ ! -s conty-start.sh ] || [ ! -s utils.tar.gz ]; then if [ ! -s conty-start.sh ] || [ ! -s utils.tar.gz ]; then

16
create-arch-bootstrap.sh Executable file → Normal file
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Dependencies: wget tar gzip grep sha256sum # Dependencies: curl tar gzip grep sha256sum
# Root rights are required # Root rights are required
if [ $EUID != 0 ]; then if [ $EUID != 0 ]; then
@ -9,8 +9,8 @@ if [ $EUID != 0 ]; then
exit 1 exit 1
fi fi
if ! command -v wget 1>/dev/null; then if ! command -v curl 1>/dev/null; then
echo "wget is required!" echo "curl is required!"
exit 1 exit 1
fi fi
@ -141,8 +141,8 @@ export packagelist="${audio_pkgs} ${video_pkgs} ${wine_pkgs} \
openbox obs-studio gamehub minigalaxy legendary gamescope \ openbox obs-studio gamehub minigalaxy legendary gamescope \
pcsx2-git multimc5 yt-dlp bottles playonlinux" pcsx2-git multimc5 yt-dlp bottles playonlinux"
wget -q --show-progress -O chaotic-keyring.pkg.tar.zst 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' curl -#LO 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
wget -q --show-progress -O chaotic-mirrorlist.pkg.tar.zst 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' curl -#LO 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
if [ ! -s chaotic-keyring.pkg.tar.zst ] || [ ! -s chaotic-mirrorlist.pkg.tar.zst ]; then if [ ! -s chaotic-keyring.pkg.tar.zst ] || [ ! -s chaotic-mirrorlist.pkg.tar.zst ]; then
echo "Seems like Chaotic-AUR keyring or mirrorlist is currently unavailable" echo "Seems like Chaotic-AUR keyring or mirrorlist is currently unavailable"
@ -157,10 +157,8 @@ bootstrap_urls=("mirror.osbeck.com" \
echo "Downloading Arch Linux bootstrap" echo "Downloading Arch Linux bootstrap"
for link in "${bootstrap_urls[@]}"; do for link in "${bootstrap_urls[@]}"; do
wget -q --show-progress -O archlinux-bootstrap-x86_64.tar.gz \ curl -#LO "https://${link}/archlinux/iso/latest/archlinux-bootstrap-x86_64.tar.gz"
"https://${link}/archlinux/iso/latest/archlinux-bootstrap-x86_64.tar.gz" curl -#LO "https://${link}/archlinux/iso/latest/sha256sums.txt"
wget -q --show-progress -O sha256sums.txt \
"https://${link}/archlinux/iso/latest/sha256sums.txt"
if [ -s sha256sums.txt ]; then if [ -s sha256sums.txt ]; then
grep bootstrap-x86_64 sha256sums.txt > sha256.txt grep bootstrap-x86_64 sha256sums.txt > sha256.txt

2
create-conty.sh
View file

@ -38,7 +38,7 @@ fi
if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 1000 ]; then if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 1000 ]; then
rm -f "${utils}" rm -f "${utils}"
wget -q --show-progress "https://github.com/Kron4ek/Conty/raw/master/${utils}" curl -#LO "https://github.com/Kron4ek/Conty/raw/master/${utils}"
fi fi
if [ ! -f conty-start.sh ]; then if [ ! -f conty-start.sh ]; then

12
create-utils.sh Executable file → Normal file
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# General build dependencies: gawk grep lz4 zstd wget gcc make autoconf # General build dependencies: gawk grep lz4 zstd curl gcc make autoconf
# libtool pkgconf libcap fuse2 (or fuse3) lzo xz zlib findutils # libtool pkgconf libcap fuse2 (or fuse3) lzo xz zlib findutils
# #
# Dwarfs build dependencies: fuse2 (or fuse3) openssl jemalloc # Dwarfs build dependencies: fuse2 (or fuse3) openssl jemalloc
@ -30,17 +30,17 @@ export LDFLAGS="-Wl,-O1,--sort-common,--as-needed"
mkdir -p "${script_dir}"/build-utils mkdir -p "${script_dir}"/build-utils
cd "${script_dir}"/build-utils || exit 1 cd "${script_dir}"/build-utils || exit 1
wget -q --show-progress -O lz4.tar.gz https://github.com/lz4/lz4/archive/refs/tags/v"${lz4_version}".tar.gz curl -#Lo lz4.tar.gz https://github.com/lz4/lz4/archive/refs/tags/v${lz4_version}.tar.gz
wget -q --show-progress -O zstd.tar.gz https://github.com/facebook/zstd/archive/refs/tags/v"${zstd_version}".tar.gz curl -#Lo zstd.tar.gz https://github.com/facebook/zstd/archive/refs/tags/v${zstd_version}.tar.gz
wget -q --show-progress -O bwrap.tar.gz https://github.com/containers/bubblewrap/archive/refs/tags/v"${bwrap_version}".tar.gz curl -#Lo bwrap.tar.gz https://github.com/containers/bubblewrap/archive/refs/tags/v${bwrap_version}.tar.gz
tar xf lz4.tar.gz tar xf lz4.tar.gz
tar xf zstd.tar.gz tar xf zstd.tar.gz
tar xf bwrap.tar.gz tar xf bwrap.tar.gz
if [ "${build_dwarfs}" != "true" ]; then if [ "${build_dwarfs}" != "true" ]; then
wget -q --show-progress -O squashfuse.tar.gz https://github.com/vasi/squashfuse/archive/refs/tags/"${squashfuse_version}".tar.gz curl -#Lo squashfuse.tar.gz https://github.com/vasi/squashfuse/archive/refs/tags/${squashfuse_version}.tar.gz
wget -q --show-progress -O sqfstools.tar.gz https://github.com/plougher/squashfs-tools/archive/refs/tags/"${squashfs_tools_version}".tar.gz curl -#Lo sqfstools.tar.gz https://github.com/plougher/squashfs-tools/archive/refs/tags/${squashfs_tools_version}.tar.gz
tar xf squashfuse.tar.gz tar xf squashfuse.tar.gz
tar xf sqfstools.tar.gz tar xf sqfstools.tar.gz