diff --git a/create-arch-bootstrap.sh b/create-arch-bootstrap.sh index cb09cea..2ff483f 100755 --- a/create-arch-bootstrap.sh +++ b/create-arch-bootstrap.sh @@ -376,12 +376,11 @@ packagelist="base base-devel nano mesa lib32-mesa vulkan-radeon lib32-vulkan-rad meson mingw-w64-gcc gamemode lib32-gamemode cmake jre8-openjdk \ libva-mesa-driver" -wget -q "https://archlinux.org/download/" -current_release="$(cat index.html | grep "Current Release" | tail -c -16 | head -c +10)" -rm index.html + +current_release="$(wget -q "https://archlinux.org/download/" -O - | grep "Current Release" | tail -c -16 | head -c +10)" echo "Downloading ${current_release} release" -wget -q --show-progress -O arch.tar.gz https://mirror.rackspace.com/archlinux/iso/${current_release}/archlinux-bootstrap-${current_release}-x86_64.tar.gz +wget -q --show-progress -O arch.tar.gz "https://mirror.rackspace.com/archlinux/iso/${current_release}/archlinux-bootstrap-${current_release}-x86_64.tar.gz" tar xf arch.tar.gz rm arch.tar.gz diff --git a/create-conty.sh b/create-conty.sh index f9366c2..12a12fb 100755 --- a/create-conty.sh +++ b/create-conty.sh @@ -4,7 +4,7 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -# Builtin suqashfuse supports only lz4 and zstd +# Builtin squashfuse supports only lz4 and zstd # So choose either lz4 or zstd squashfs_compressor="lz4" compressor_arguments="-Xhc" diff --git a/squashfs-start.sh b/squashfs-start.sh index d753ebb..f3347af 100755 --- a/squashfs-start.sh +++ b/squashfs-start.sh @@ -3,7 +3,7 @@ ## Dependencies: bash fuse2 tar coreutils # Prevent launching as root -if [ -z $ALLOW_ROOT ]; then +if [ -z "$ALLOW_ROOT" ]; then if [ $EUID = 0 ]; then echo "Do not run this app as root!" echo @@ -183,8 +183,7 @@ run_bwrap () { mkdir -p "${working_dir}"/mnt "${fmount}" -u "${working_dir}"/mnt 2>/dev/null || umount "${working_dir}"/mnt 2>/dev/null -"${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/mnt -if [ $? = 0 ]; then +if "${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/mnt ; then echo "Running Conty" if [ -n "${AUTOSTART}" ]; then