diff --git a/src/main.rs b/src/main.rs index f079832..9c6d405 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,8 +29,8 @@ struct SharedState { #[get("/")] fn index() -> String { format!("Wecome to the AV1Master Server version {version}\n -This currently requires a working nix installion\n -curl -L {baseurl}/client.sh > client.sh && chmod +x ./client.sh && ./client.sh {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as") +This currently requires a distro with CAP_SYS_USER_NS enabled and correct permissions +curl -L {baseurl}/client.sh > client.sh && chmod +x ./av1client && ./av1client {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as") } #[get("/version")] diff --git a/src/static/av1client.REMOVED.git-id b/src/static/av1client.REMOVED.git-id new file mode 100644 index 0000000..9777b13 --- /dev/null +++ b/src/static/av1client.REMOVED.git-id @@ -0,0 +1 @@ +90d35de41aad83f4f5eb6eac0930c4bdb1401735 \ No newline at end of file diff --git a/src/static/client.sh b/src/static/client.sh index c243712..4ef95b5 100644 --- a/src/static/client.sh +++ b/src/static/client.sh @@ -1,23 +1,22 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p bash curl jq libaom ffmpeg-full +#! /usr/bin/env bash set -euo pipefail IFS=$'\n\t' base_url="$1" -version="0.4.0" +version="0.5.0" while true; do sleep 30 set +e - upsteam_version=`curl -s "$base_url"/version` + upstream_version=`curl -L -f -s "$base_url"/version` retval=$? set -e if [ $retval -ne 0 ]; then echo "Is the Job Server Down?" continue fi - if [[ $version != $upsteam_version ]]; then + if [[ $version != $upstream_version ]]; then echo "Wrong version: client version is $version, while job server requires $upstream_version" break fi