diff options
| -rw-r--r-- | ContainerFile | 2 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | REQUIREMENTS | 1 | ||||
| -rwxr-xr-x | install.sh | 2 | ||||
| -rwxr-xr-x | lib/_ak_fs | 2 | ||||
| -rwxr-xr-x | lib/_ak_ipfs | 4 | ||||
| -rw-r--r-- | podman/ContainerFile.archlinux | 1 |
8 files changed, 6 insertions, 9 deletions
diff --git a/ContainerFile b/ContainerFile index 565fc26..5aff869 100644 --- a/ContainerFile +++ b/ContainerFile @@ -1,6 +1,6 @@ FROM fedora:latest RUN dnf update -y && dnf install which git screen pinentry make gcc -y -RUN dnf install -y curl wget jq nodejs +RUN dnf install -y curl jq nodejs RUN dnf install -y nano COPY . /root/arching-kaos-tools RUN bash -c 'cd /root/arching-kaos-tools && /root/arching-kaos-tools/install.sh' @@ -53,7 +53,7 @@ In a bash terminal issue the following commands: cd $HOME mkdir arching-kaos-tools cd arching-kaos-tools -wget https://arching-kaos.net/files/arching-kaos-tools/arching-kaos-tools-nightly-20230914.tar.gz +curl -s -o arching-kaos-tools-nightly-20230914.tar.gz https://arching-kaos.net/lfiles/arching-kaos-tools/arching-kaos-tools-nightly-20230914.tar.gz tar xvf arching-kaos-tools-nightly-20230914.tar.gz ``` @@ -68,7 +68,6 @@ programs used are: - bash (v5.1.8) - gpg (v2.3.4) -- wget (v1.21.2) - curl (v7.79.1) - git (v2.34.1) - which (v2.21) diff --git a/REQUIREMENTS b/REQUIREMENTS index 95d93c7..0040295 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -15,7 +15,6 @@ npm npx make curl -wget screen Note that some of those are checked if they already exist in your system during @@ -68,7 +68,7 @@ checkIfSudoAvailable(){ checkIfSudoAvailable # Depedencies check and install -declare -a depedencies=("curl" "wget" "bash" "jq" "npm" "gpg" "git" "make" "screen" "gpg-agent") +declare -a depedencies=("curl" "bash" "jq" "npm" "gpg" "git" "make" "screen" "gpg-agent") for dep in "${depedencies[@]}" do printf "Checking for %s..." "$dep" @@ -285,7 +285,7 @@ _ak_fs_find_depth(){ else exit 111 # Try to download stuff - # wget -s $remoteMrk/$currentNode -O $AK_LEAFSDIR/$currentNode + # curl -s $remoteMrk/$currentNode -o $AK_LEAFSDIR/$currentNode # if [ $? -ne 0 ] # then # exit 111 diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs index 94f5913..c5e0b6a 100755 --- a/lib/_ak_ipfs +++ b/lib/_ak_ipfs @@ -453,7 +453,7 @@ _ak_ipfs_download(){ _ak_log_info "Downloading ipfs $IPFS_VERSION" if [ ! -f $AK_ARCHIVESDIR/$IPFS_TARGET_FILE ] then - wget -O $AK_ARCHIVESDIR/$IPFS_TARGET_FILE https://dist.ipfs.tech/kubo/$IPFS_VERSION/$IPFS_TARGET_FILE ; + curl -s -o $AK_ARCHIVESDIR/$IPFS_TARGET_FILE https://dist.ipfs.tech/kubo/$IPFS_VERSION/$IPFS_TARGET_FILE else _ak_log_info "Already have the latest version" exit 0 @@ -485,7 +485,7 @@ _ak_ipfs_swarm_install(){ if [ ! -f $AK_IPFS_REPO/swarm.key ] then _ak_log_info "Downloading swarm key" - wget -O $AK_IPFS_REPO/swarm.key https://arching-kaos.net/files/swarm.key + curl -s -o $AK_IPFS_REPO/swarm.key https://arching-kaos.net/files/swarm.key elif [ -f $AK_IPFS_REPO/swarm.key ] && [ "$(sha512sum $AK_IPFS_REPO/swarm.key | awk '{ print $1 }')" == "$SWARMSHA512SUM" ] then _ak_log_info "Congrats! You are already in our swarm" diff --git a/podman/ContainerFile.archlinux b/podman/ContainerFile.archlinux index ef124b2..2bc5b76 100644 --- a/podman/ContainerFile.archlinux +++ b/podman/ContainerFile.archlinux @@ -1,6 +1,5 @@ FROM archlinux:latest RUN pacman -Suy --noconfirm && pacman -Syu --noconfirm which git screen pinentry -y -RUN pacman -Suy --noconfirm wget -y RUN pacman -Suy --noconfirm jq -y RUN pacman -Suy --noconfirm nodejs -y RUN pacman -Suy --noconfirm npm -y |